diff options
| author | 2016-10-13 13:48:23 -0700 | |
|---|---|---|
| committer | 2016-10-13 17:37:56 -0700 | |
| commit | 1a5337fff2cc6cb9d563c8b32aca75f485d23373 (patch) | |
| tree | 03616e90a91c5c4c1bd7ff03c3d193c3b24bf0db /runtime/mirror/array.h | |
| parent | c8b722b3cebff245d614e95d1849de45ef7bdf06 (diff) | |
Move mirror::ObjectArray to ObjPtr
Also reduce calls to ObjPtr::Ptr.
Bug: 31113334
Test: test-art-host -j32
Change-Id: I73e1b356972bb079b66332f00f7f07451601044e
Diffstat (limited to 'runtime/mirror/array.h')
| -rw-r--r-- | runtime/mirror/array.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h index 6c82eb92a1..04d02f774f 100644 --- a/runtime/mirror/array.h +++ b/runtime/mirror/array.h @@ -20,6 +20,7 @@ #include "base/enums.h" #include "gc_root.h" #include "gc/allocator_type.h" +#include "obj_ptr.h" #include "object.h" #include "object_callbacks.h" @@ -89,7 +90,7 @@ class MANAGED Array : public Object { REQUIRES(!Roles::uninterruptible_); protected: - void ThrowArrayStoreException(Object* object) REQUIRES_SHARED(Locks::mutator_lock_) + void ThrowArrayStoreException(ObjPtr<Object> object) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); private: |