diff options
| author | 2016-10-03 18:01:28 -0700 | |
|---|---|---|
| committer | 2016-10-04 10:46:16 -0700 | |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/common_runtime_test.cc | |
| 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/common_runtime_test.cc')
| -rw-r--r-- | runtime/common_runtime_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index ea0719502a..84752f03c7 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -514,9 +514,9 @@ std::vector<const DexFile*> CommonRuntimeTestImpl::GetDexFiles(jobject jclass_lo soa.Decode<mirror::ClassLoader>(jclass_loader)); DCHECK_EQ(class_loader->GetClass(), - soa.Decode<mirror::Class>(WellKnownClasses::dalvik_system_PathClassLoader).Decode()); + soa.Decode<mirror::Class>(WellKnownClasses::dalvik_system_PathClassLoader).Ptr()); DCHECK_EQ(class_loader->GetParent()->GetClass(), - soa.Decode<mirror::Class>(WellKnownClasses::java_lang_BootClassLoader).Decode()); + soa.Decode<mirror::Class>(WellKnownClasses::java_lang_BootClassLoader).Ptr()); // The class loader is a PathClassLoader which inherits from BaseDexClassLoader. // We need to get the DexPathList and loop through it. |