From 1a5337fff2cc6cb9d563c8b32aca75f485d23373 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 13 Oct 2016 13:48:23 -0700 Subject: Move mirror::ObjectArray to ObjPtr Also reduce calls to ObjPtr::Ptr. Bug: 31113334 Test: test-art-host -j32 Change-Id: I73e1b356972bb079b66332f00f7f07451601044e --- runtime/mirror/array.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/mirror/array.h') 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) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); private: -- cgit v1.2.3-59-g8ed1b