diff options
author | 2016-10-17 15:46:31 -0700 | |
---|---|---|
committer | 2016-10-17 16:16:50 -0700 | |
commit | bc5a795c0d486c84913d987cad5846ded840cea6 (patch) | |
tree | 90db29a97a21fa15f4cbc5ffbc1f6dd191add49c /runtime/class_linker.h | |
parent | 38a4223fcc0493553d9ad324a1dc145869eb663a (diff) |
Move art/native to ObjPtr
Bug: 31113334
Test: test-art-host
Change-Id: I67eb89cf042c762c6dcd5eb8b008b9a28e9b3319
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r-- | runtime/class_linker.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 70cc768686..6437010f3f 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -181,7 +181,7 @@ class ClassLinker { const char* descriptor, size_t hash, Handle<mirror::ClassLoader> class_loader, - mirror::Class** result) + ObjPtr<mirror::Class>* result) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!dex_lock_); @@ -192,7 +192,7 @@ class ClassLinker { REQUIRES(!dex_lock_); // Finds the array class given for the element class. - mirror::Class* FindArrayClass(Thread* self, mirror::Class** element_class) + mirror::Class* FindArrayClass(Thread* self, ObjPtr<mirror::Class>* element_class) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!dex_lock_); @@ -606,7 +606,8 @@ class ClassLinker { REQUIRES_SHARED(Locks::mutator_lock_); // May be called with null class_loader due to legacy code. b/27954959 - void InsertDexFileInToClassLoader(mirror::Object* dex_file, mirror::ClassLoader* class_loader) + void InsertDexFileInToClassLoader(ObjPtr<mirror::Object> dex_file, + ObjPtr<mirror::ClassLoader> class_loader) REQUIRES(!Locks::classlinker_classes_lock_) REQUIRES_SHARED(Locks::mutator_lock_); |