From 423bebb17f15c3867a52315f0ae421f08f14544f Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 26 Mar 2019 15:17:21 +0000 Subject: ObjPtr<>-ify mirror::ObjectArray. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 31113334 Change-Id: I611b3e49d3feed306f6cd35d2b662a1e727e24c6 --- runtime/mirror/object_array.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/mirror/object_array.h') diff --git a/runtime/mirror/object_array.h b/runtime/mirror/object_array.h index 6506f6ea9a..f7046d1307 100644 --- a/runtime/mirror/object_array.h +++ b/runtime/mirror/object_array.h @@ -44,7 +44,7 @@ class MANAGED ObjectArray: public Array { template - ALWAYS_INLINE T* Get(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); + ALWAYS_INLINE ObjPtr Get(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); // Returns true if the object can be stored into the array. If not, throws // an ArrayStoreException and returns false. @@ -74,7 +74,7 @@ class MANAGED ObjectArray: public Array { template - ALWAYS_INLINE T* GetWithoutChecks(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); + ALWAYS_INLINE ObjPtr GetWithoutChecks(int32_t i) REQUIRES_SHARED(Locks::mutator_lock_); // Copy src into this array (dealing with overlaps as memmove does) without assignability checks. void AssignableMemmove(int32_t dst_pos, -- cgit v1.2.3-59-g8ed1b