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_String.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_String.cc')
| -rw-r--r-- | runtime/native/java_lang_String.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc index b3a967d167..5a49c203af 100644 --- a/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc @@ -41,7 +41,7 @@ static jint String_compareTo(JNIEnv* env, jobject java_this, jobject java_rhs) { return -1; } else { return soa.Decode<mirror::String>(java_this)->CompareTo( - soa.Decode<mirror::String>(java_rhs).Decode()); + soa.Decode<mirror::String>(java_rhs).Ptr()); } } |