diff options
| author | 2016-10-03 18:01:28 -0700 | |
|---|---|---|
| committer | 2016-10-04 10:46:16 -0700 | |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/obj_ptr-inl.h | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode.
Bug: 31113334
Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
Diffstat (limited to 'runtime/obj_ptr-inl.h')
| -rw-r--r-- | runtime/obj_ptr-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/obj_ptr-inl.h b/runtime/obj_ptr-inl.h index 1c698b5c4d..f0a5f6f2e2 100644 --- a/runtime/obj_ptr-inl.h +++ b/runtime/obj_ptr-inl.h @@ -33,7 +33,7 @@ inline bool ObjPtr<MirrorType, kPoison>::IsValid() const { template<class MirrorType, bool kPoison> inline void ObjPtr<MirrorType, kPoison>::AssertValid() const { if (kPoison) { - CHECK(IsValid()) << "Stale object pointer " << DecodeUnchecked() << " , expected cookie " + CHECK(IsValid()) << "Stale object pointer " << Ptr() << " , expected cookie " << TrimCookie(Thread::Current()->GetPoisonObjectCookie()) << " but got " << GetCookie(); } } @@ -56,7 +56,7 @@ inline uintptr_t ObjPtr<MirrorType, kPoison>::Encode(MirrorType* ptr) { template<class MirrorType, bool kPoison> inline std::ostream& operator<<(std::ostream& os, ObjPtr<MirrorType, kPoison> ptr) { // May be used for dumping bad pointers, do not use the checked version. - return os << ptr.DecodeUnchecked(); + return os << ptr.PtrUnchecked(); } } // namespace art |