diff options
| author | 2016-10-06 15:13:58 -0700 | |
|---|---|---|
| committer | 2016-10-06 15:53:58 -0700 | |
| commit | a058fdf0cf7435a13a6e8cae5e3a9bfa1513828d (patch) | |
| tree | 85de1316f29f661372841d5feee16c370375fc16 /runtime/obj_ptr.h | |
| parent | c4f3925490a73da8dc74884a1deb965d4ecaf14e (diff) | |
Move mirror::Object setters to ObjPtr
Bug: 31113334
Test: test-art-host
Change-Id: I2c4c84645e194c3c435a4a6fd670176b0e98671f
Diffstat (limited to 'runtime/obj_ptr.h')
| -rw-r--r-- | runtime/obj_ptr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/obj_ptr.h b/runtime/obj_ptr.h index 74be44eb23..75a6f9fe55 100644 --- a/runtime/obj_ptr.h +++ b/runtime/obj_ptr.h @@ -22,7 +22,6 @@ #include "base/mutex.h" // For Locks::mutator_lock_. #include "globals.h" -#include "mirror/object_reference.h" namespace art { @@ -32,7 +31,7 @@ namespace art { template<class MirrorType, bool kPoison = kIsDebugBuild> class ObjPtr { static constexpr size_t kCookieShift = - sizeof(mirror::HeapReference<mirror::Object>) * kBitsPerByte - kObjectAlignmentShift; + sizeof(kHeapReferenceSize) * kBitsPerByte - kObjectAlignmentShift; static constexpr size_t kCookieBits = sizeof(uintptr_t) * kBitsPerByte - kCookieShift; static constexpr uintptr_t kCookieMask = (static_cast<uintptr_t>(1u) << kCookieBits) - 1; |