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/dex_file_annotations.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/dex_file_annotations.cc') diff --git a/runtime/dex_file_annotations.cc b/runtime/dex_file_annotations.cc index feb75a8293..367603e1f0 100644 --- a/runtime/dex_file_annotations.cc +++ b/runtime/dex_file_annotations.cc @@ -255,7 +255,7 @@ mirror::Object* ProcessEncodedAnnotation(Handle klass, const uint } mirror::Class* annotation_member_class = - soa.Decode(WellKnownClasses::libcore_reflect_AnnotationMember).Decode(); + soa.Decode(WellKnownClasses::libcore_reflect_AnnotationMember).Ptr(); mirror::Class* annotation_member_array_class = class_linker->FindArrayClass(self, &annotation_member_class); if (annotation_member_array_class == nullptr) { @@ -572,12 +572,12 @@ bool ProcessAnnotationValue(Handle klass, *annotation_ptr = annotation; if (result_style == DexFile::kAllObjects && primitive_type != Primitive::kPrimVoid) { - element_object = BoxPrimitive(primitive_type, annotation_value->value_).Decode(); + element_object = BoxPrimitive(primitive_type, annotation_value->value_).Ptr(); set_object = true; } if (set_object) { - annotation_value->value_.SetL(element_object.Decode()); + annotation_value->value_.SetL(element_object.Ptr()); } return true; @@ -840,7 +840,7 @@ mirror::ObjectArray* ProcessAnnotationSetRefList( ScopedObjectAccessUnchecked soa(self); StackHandleScope<1> hs(self); mirror::Class* annotation_array_class = - soa.Decode(WellKnownClasses::java_lang_annotation_Annotation__array).Decode(); + soa.Decode(WellKnownClasses::java_lang_annotation_Annotation__array).Ptr(); mirror::Class* annotation_array_array_class = Runtime::Current()->GetClassLinker()->FindArrayClass(self, &annotation_array_class); if (annotation_array_array_class == nullptr) { -- cgit v1.2.3-59-g8ed1b