From 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Mon, 3 Oct 2016 18:01:28 -0700
Subject: Rename ObjPtr::Decode to ObjPtr::Ptr

Done to prevent ambiguity with ScopedObjectAccess::Decode.

Bug: 31113334

Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
---
 patchoat/patchoat.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'patchoat/patchoat.cc')

diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index b259f64d1e..f3eb663cb8 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -505,7 +505,7 @@ class PatchOatArtFieldVisitor : public ArtFieldVisitor {
   void Visit(ArtField* field) OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) {
     ArtField* const dest = patch_oat_->RelocatedCopyOf(field);
     dest->SetDeclaringClass(
-        patch_oat_->RelocatedAddressOfPointer(field->GetDeclaringClass().Decode()));
+        patch_oat_->RelocatedAddressOfPointer(field->GetDeclaringClass().Ptr()));
   }
 
  private:
-- 
cgit v1.2.3-59-g8ed1b