commit 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04
author Mathieu Chartier <mathieuc@google.com> Mon Oct 03 18:01:28 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Oct 04 10:46:16 2016 -0700
tree 718e322f3d05ac095770d4dc2a68b824bf3974a7
parent 82d4838d6bb3480cd25327cedc5179fb2d86881c

Rename ObjPtr::Decode to ObjPtr::Ptr

Done to prevent ambiguity with ScopedObjectAccess::Decode.

Bug: 31113334

Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316

runtime/gc_root-inl.h

diff --git a/runtime/gc_root-inl.h b/runtime/gc_root-inl.h
index 11ccd33..390ed3c 100644
--- a/runtime/gc_root-inl.h
+++ b/runtime/gc_root-inl.h
@@ -39,7 +39,7 @@
 
 template<class MirrorType>
 inline GcRoot<MirrorType>::GcRoot(ObjPtr<MirrorType, kIsDebugBuild> ref)
-    : GcRoot(ref.Decode()) { }
+    : GcRoot(ref.Ptr()) { }
 
 inline std::string RootInfo::ToString() const {
   std::ostringstream oss;