summaryrefslogtreecommitdiff
path: root/runtime/mirror/object_array-inl.h
diff options
context:
space:
mode:
author David Sehr <sehr@google.com> 2016-10-19 16:18:50 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-10-19 16:18:51 +0000
commitc89f9776a107ca20d0146c16fa881db91c4f8266 (patch)
treef77bd4525e69c4874c52183878ae642fd5a2201c /runtime/mirror/object_array-inl.h
parent58b99c78d0bba093fddebab0dcad45bbcf5c55d9 (diff)
parent709b070044354d9f47641f273edacaeeb0240ab7 (diff)
Merge "Remove mirror:: and ArtMethod deps in utils.{h,cc}"
Diffstat (limited to 'runtime/mirror/object_array-inl.h')
-rw-r--r--runtime/mirror/object_array-inl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h
index 3c2390b08d..5fb945958d 100644
--- a/runtime/mirror/object_array-inl.h
+++ b/runtime/mirror/object_array-inl.h
@@ -238,8 +238,8 @@ inline void ObjectArray<T>::AssignableCheckingMemcpy(int32_t dst_pos,
}
Runtime::Current()->GetHeap()->WriteBarrierArray(this, dst_pos, count);
if (UNLIKELY(i != count)) {
- std::string actualSrcType(PrettyTypeOf(o));
- std::string dstType(PrettyTypeOf(this));
+ std::string actualSrcType(mirror::Object::PrettyTypeOf(o));
+ std::string dstType(PrettyTypeOf());
Thread* self = Thread::Current();
if (throw_exception) {
self->ThrowNewExceptionF("Ljava/lang/ArrayStoreException;",