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 --- compiler/oat_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/oat_test.cc') diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index e8bc67d967..9f352ce093 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -498,7 +498,7 @@ TEST_F(OatTest, EmptyTextSection) { for (const DexFile* dex_file : dex_files) { ScopedObjectAccess soa(Thread::Current()); class_linker->RegisterDexFile(*dex_file, - soa.Decode(class_loader).Decode()); + soa.Decode(class_loader).Ptr()); } compiler_driver_->SetDexFilesForOatFile(dex_files); compiler_driver_->CompileAll(class_loader, dex_files, &timings); -- cgit v1.2.3-59-g8ed1b