diff options
| author | 2016-01-28 03:02:05 +0000 | |
|---|---|---|
| committer | 2016-01-28 03:02:05 +0000 | |
| commit | c5a8af76c337b49a05fe647cf2d1a0ceb8da4f76 (patch) | |
| tree | 44242d724fc1ec7f3e0fbd792d10a7da9d84966e /runtime/mirror/array.h | |
| parent | 78e90155b249588cb800e7f6e5993ebcbd465292 (diff) | |
| parent | 1bbfab6feed9c03bde3118bd7dab689a3b808dc0 (diff) | |
Merge changes from topic 'pointer_conversion'
* changes:
Pass template args down
Fix pointer conversion error in SetElementPtrSize
Diffstat (limited to 'runtime/mirror/array.h')
| -rw-r--r-- | runtime/mirror/array.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h index 50d77ebdb8..2bd6c5b9a1 100644 --- a/runtime/mirror/array.h +++ b/runtime/mirror/array.h @@ -187,8 +187,11 @@ class PointerArray : public Array { T GetElementPtrSize(uint32_t idx, size_t ptr_size) SHARED_REQUIRES(Locks::mutator_lock_); + template<bool kTransactionActive = false, bool kUnchecked = false> + void SetElementPtrSize(uint32_t idx, uint64_t element, size_t ptr_size) + SHARED_REQUIRES(Locks::mutator_lock_); template<bool kTransactionActive = false, bool kUnchecked = false, typename T> - void SetElementPtrSize(uint32_t idx, T element, size_t ptr_size) + void SetElementPtrSize(uint32_t idx, T* element, size_t ptr_size) SHARED_REQUIRES(Locks::mutator_lock_); // Fixup the pointers in the dest arrays by passing our pointers through the visitor. Only copies |