diff options
author | 2016-10-03 18:01:28 -0700 | |
---|---|---|
committer | 2016-10-04 10:46:16 -0700 | |
commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/native/java_lang_Class.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/native/java_lang_Class.cc')
-rw-r--r-- | runtime/native/java_lang_Class.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index 34bd57b090..87bff5ffc5 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -354,8 +354,8 @@ static jobject Class_getDeclaredConstructorInternal( ObjPtr<mirror::Constructor> result = mirror::Class::GetDeclaredConstructorInternal<kRuntimePointerSize, false>( soa.Self(), - DecodeClass(soa, javaThis).Decode(), - soa.Decode<mirror::ObjectArray<mirror::Class>>(args).Decode()); + DecodeClass(soa, javaThis).Ptr(), + soa.Decode<mirror::ObjectArray<mirror::Class>>(args).Ptr()); return soa.AddLocalReference<jobject>(result); } @@ -405,9 +405,9 @@ static jobject Class_getDeclaredMethodInternal(JNIEnv* env, jobject javaThis, DCHECK(!Runtime::Current()->IsActiveTransaction()); mirror::Method* result = mirror::Class::GetDeclaredMethodInternal<kRuntimePointerSize, false>( soa.Self(), - DecodeClass(soa, javaThis).Decode(), - soa.Decode<mirror::String>(name).Decode(), - soa.Decode<mirror::ObjectArray<mirror::Class>>(args).Decode()); + DecodeClass(soa, javaThis).Ptr(), + soa.Decode<mirror::String>(name).Ptr(), + soa.Decode<mirror::ObjectArray<mirror::Class>>(args).Ptr()); return soa.AddLocalReference<jobject>(result); } @@ -475,7 +475,7 @@ static jobjectArray Class_getDeclaredAnnotations(JNIEnv* env, jobject javaThis) soa.Decode<mirror::Class>(WellKnownClasses::java_lang_annotation_Annotation__array); mirror::ObjectArray<mirror::Object>* empty_array = mirror::ObjectArray<mirror::Object>::Alloc(soa.Self(), - annotation_array_class.Decode(), + annotation_array_class.Ptr(), 0); return soa.AddLocalReference<jobjectArray>(empty_array); } |