diff options
Diffstat (limited to 'runtime/mirror/class_loader.h')
-rw-r--r-- | runtime/mirror/class_loader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/mirror/class_loader.h b/runtime/mirror/class_loader.h index 1957e13e36..407678a52b 100644 --- a/runtime/mirror/class_loader.h +++ b/runtime/mirror/class_loader.h @@ -36,26 +36,26 @@ class MANAGED ClassLoader : public Object { return sizeof(ClassLoader); } - ClassLoader* GetParent() SHARED_REQUIRES(Locks::mutator_lock_) { + ClassLoader* GetParent() REQUIRES_SHARED(Locks::mutator_lock_) { return GetFieldObject<ClassLoader>(OFFSET_OF_OBJECT_MEMBER(ClassLoader, parent_)); } - ClassTable* GetClassTable() SHARED_REQUIRES(Locks::mutator_lock_) { + ClassTable* GetClassTable() REQUIRES_SHARED(Locks::mutator_lock_) { return reinterpret_cast<ClassTable*>( GetField64(OFFSET_OF_OBJECT_MEMBER(ClassLoader, class_table_))); } - void SetClassTable(ClassTable* class_table) SHARED_REQUIRES(Locks::mutator_lock_) { + void SetClassTable(ClassTable* class_table) REQUIRES_SHARED(Locks::mutator_lock_) { SetField64<false>(OFFSET_OF_OBJECT_MEMBER(ClassLoader, class_table_), reinterpret_cast<uint64_t>(class_table)); } - LinearAlloc* GetAllocator() SHARED_REQUIRES(Locks::mutator_lock_) { + LinearAlloc* GetAllocator() REQUIRES_SHARED(Locks::mutator_lock_) { return reinterpret_cast<LinearAlloc*>( GetField64(OFFSET_OF_OBJECT_MEMBER(ClassLoader, allocator_))); } - void SetAllocator(LinearAlloc* allocator) SHARED_REQUIRES(Locks::mutator_lock_) { + void SetAllocator(LinearAlloc* allocator) REQUIRES_SHARED(Locks::mutator_lock_) { SetField64<false>(OFFSET_OF_OBJECT_MEMBER(ClassLoader, allocator_), reinterpret_cast<uint64_t>(allocator)); } @@ -68,7 +68,7 @@ class MANAGED ClassLoader : public Object { ReadBarrierOption kReadBarrierOption = kWithReadBarrier, typename Visitor> void VisitReferences(mirror::Class* klass, const Visitor& visitor) - SHARED_REQUIRES(Locks::mutator_lock_) + REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::classlinker_classes_lock_); // Field order required by test "ValidateFieldOrderOfJavaCppUnionClasses". |