diff options
| author | 2016-10-06 17:44:26 -0700 | |
|---|---|---|
| committer | 2016-10-12 09:49:49 -0700 | |
| commit | 9d156d500801accee919b6d51e22d6ddcdcd4a05 (patch) | |
| tree | 92129562c0ba1673c660297f26444a4a2ad31459 /runtime/mirror/object.h | |
| parent | 078483d4dfd049d5b3f192a99e2dfdc355e4754f (diff) | |
Move Heap parameters to ObjPtr
Deleted some unused object dumping code.
Test: test-art-host
Bug: 31113334
Change-Id: I747220caafe6679591fd4b361d7f50383a046164
Diffstat (limited to 'runtime/mirror/object.h')
| -rw-r--r-- | runtime/mirror/object.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h index 9ddf99500e..175b0c3c97 100644 --- a/runtime/mirror/object.h +++ b/runtime/mirror/object.h @@ -612,7 +612,9 @@ class MANAGED LOCKABLE Object { // A utility function that copies an object in a read barrier and // write barrier-aware way. This is internally used by Clone() and // Class::CopyOf(). - static Object* CopyObject(Thread* self, mirror::Object* dest, mirror::Object* src, + static Object* CopyObject(Thread* self, + ObjPtr<mirror::Object> dest, + ObjPtr<mirror::Object> src, size_t num_bytes) REQUIRES_SHARED(Locks::mutator_lock_); |