diff options
| author | 2016-08-31 17:49:55 +0000 | |
|---|---|---|
| committer | 2016-08-31 17:49:55 +0000 | |
| commit | 3d08238729dedecba73ddc0b42bc6bbf4806ecae (patch) | |
| tree | 92989553b03c704f79e2aae907b3b10479bc830e /runtime/mirror/array-inl.h | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
| parent | bdf7f1c3ab65ccb70f62db5ab31dba060632d458 (diff) | |
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
Diffstat (limited to 'runtime/mirror/array-inl.h')
| -rw-r--r-- | runtime/mirror/array-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h index 014e54b1e1..9d7f98fe62 100644 --- a/runtime/mirror/array-inl.h +++ b/runtime/mirror/array-inl.h @@ -101,7 +101,7 @@ class SetLengthVisitor { } void operator()(Object* obj, size_t usable_size ATTRIBUTE_UNUSED) const - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { // Avoid AsArray as object is not yet in live bitmap or allocation stack. Array* array = down_cast<Array*>(obj); // DCHECK(array->IsArrayInstance()); @@ -125,7 +125,7 @@ class SetLengthToUsableSizeVisitor { } void operator()(Object* obj, size_t usable_size) const - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { // Avoid AsArray as object is not yet in live bitmap or allocation stack. Array* array = down_cast<Array*>(obj); // DCHECK(array->IsArrayInstance()); |