diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2016-10-03 18:01:28 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2016-10-04 10:46:16 -0700 |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /benchmark | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
| download | android_art-1cc62e4ea24828fdb3f3da0b8603f0b107d09a04.tar.gz android_art-1cc62e4ea24828fdb3f3da0b8603f0b107d09a04.tar.bz2 android_art-1cc62e4ea24828fdb3f3da0b8603f0b107d09a04.zip | |
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 'benchmark')
| -rw-r--r-- | benchmark/jobject-benchmark/jobject_benchmark.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/benchmark/jobject-benchmark/jobject_benchmark.cc b/benchmark/jobject-benchmark/jobject_benchmark.cc index 4b2c024625..de43f73800 100644 --- a/benchmark/jobject-benchmark/jobject_benchmark.cc +++ b/benchmark/jobject-benchmark/jobject_benchmark.cc @@ -29,7 +29,7 @@ extern "C" JNIEXPORT void JNICALL Java_JObjectBenchmark_timeAddRemoveLocal( ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(jobj); CHECK(obj != nullptr); for (jint i = 0; i < reps; ++i) { - jobject ref = soa.Env()->AddLocalReference<jobject>(obj.Decode()); + jobject ref = soa.Env()->AddLocalReference<jobject>(obj.Ptr()); soa.Env()->DeleteLocalRef(ref); } } @@ -39,7 +39,7 @@ extern "C" JNIEXPORT void JNICALL Java_JObjectBenchmark_timeDecodeLocal( ScopedObjectAccess soa(env); ObjPtr<mirror::Object> obj = soa.Decode<mirror::Object>(jobj); CHECK(obj != nullptr); - jobject ref = soa.Env()->AddLocalReference<jobject>(obj.Decode()); + jobject ref = soa.Env()->AddLocalReference<jobject>(obj.Ptr()); for (jint i = 0; i < reps; ++i) { CHECK_EQ(soa.Decode<mirror::Object>(ref), obj); } |