diff options
Diffstat (limited to 'runtime/mirror/array.h')
| -rw-r--r-- | runtime/mirror/array.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h index 570dcaa292..584a4c095b 100644 --- a/runtime/mirror/array.h +++ b/runtime/mirror/array.h @@ -24,28 +24,15 @@ namespace mirror { class MANAGED Array : public Object { public: - // A convenience for code that doesn't know the component size, - // and doesn't want to have to work it out itself. + // A convenience for code that doesn't know the component size, and doesn't want to have to work + // it out itself. + template <bool kIsMovable, bool kIsInstrumented> static Array* Alloc(Thread* self, Class* array_class, int32_t component_count) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return AllocInstrumented(self, array_class, component_count); - } - static Array* AllocUninstrumented(Thread* self, Class* array_class, int32_t component_count) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - static Array* AllocInstrumented(Thread* self, Class* array_class, int32_t component_count) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + template <bool kIsMovable, bool kIsInstrumented> static Array* Alloc(Thread* self, Class* array_class, int32_t component_count, - size_t component_size) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return AllocInstrumented(self, array_class, component_count, component_size); - } - static Array* AllocUninstrumented(Thread* self, Class* array_class, int32_t component_count, - size_t component_size) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - static Array* AllocInstrumented(Thread* self, Class* array_class, int32_t component_count, - size_t component_size) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + size_t component_size) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); static Array* CreateMultiArray(Thread* self, Class* element_class, IntArray* dimensions) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |