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_System.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_System.cc')
-rw-r--r-- | runtime/native/java_lang_System.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc index 8b9d0c7578..f3756a23c7 100644 --- a/runtime/native/java_lang_System.cc +++ b/runtime/native/java_lang_System.cc @@ -62,12 +62,12 @@ static void System_arraycopy(JNIEnv* env, jclass, jobject javaSrc, jint srcPos, // Make sure source and destination are both arrays. ObjPtr<mirror::Object> srcObject = soa.Decode<mirror::Object>(javaSrc); if (UNLIKELY(!srcObject->IsArrayInstance())) { - ThrowArrayStoreException_NotAnArray("source", srcObject.Decode()); + ThrowArrayStoreException_NotAnArray("source", srcObject.Ptr()); return; } ObjPtr<mirror::Object> dstObject = soa.Decode<mirror::Object>(javaDst); if (UNLIKELY(!dstObject->IsArrayInstance())) { - ThrowArrayStoreException_NotAnArray("destination", dstObject.Decode()); + ThrowArrayStoreException_NotAnArray("destination", dstObject.Ptr()); return; } mirror::Array* srcArray = srcObject->AsArray(); |