From 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier 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 --- runtime/class_linker_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/class_linker_test.cc') diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 4a926e7619..546653960f 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -875,7 +875,7 @@ TEST_F(ClassLinkerTest, LookupResolvedType) { uint32_t type_idx = klass->GetClassDef()->class_idx_; ObjPtr dex_cache = klass->GetDexCache(); const DexFile& dex_file = klass->GetDexFile(); - EXPECT_EQ(dex_cache->GetResolvedType(type_idx), klass.Decode()); + EXPECT_EQ(dex_cache->GetResolvedType(type_idx), klass.Ptr()); EXPECT_OBJ_PTR_EQ( class_linker_->LookupResolvedType(dex_file, type_idx, dex_cache, class_loader.Get()), klass); -- cgit v1.2.3-59-g8ed1b