diff options
| -rw-r--r-- | libartbase/base/hash_set.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libartbase/base/hash_set.h b/libartbase/base/hash_set.h index fec9440ebe..91766a75d1 100644 --- a/libartbase/base/hash_set.h +++ b/libartbase/base/hash_set.h @@ -745,7 +745,7 @@ class HashSet { data_ = allocfn_.allocate(num_buckets_); owns_data_ = true; for (size_t i = 0; i < num_buckets_; ++i) { - allocfn_.construct(allocfn_.address(data_[i])); + std::allocator_traits<allocator_type>::construct(allocfn_, std::addressof(data_[i])); emptyfn_.MakeEmpty(data_[i]); } } @@ -753,7 +753,7 @@ class HashSet { void DeallocateStorage() { if (owns_data_) { for (size_t i = 0; i < NumBuckets(); ++i) { - allocfn_.destroy(allocfn_.address(data_[i])); + std::allocator_traits<allocator_type>::destroy(allocfn_, std::addressof(data_[i])); } if (data_ != nullptr) { allocfn_.deallocate(data_, NumBuckets()); @@ -788,7 +788,7 @@ class HashSet { data_[FirstAvailableSlot(IndexForHash(hashfn_(element)))] = std::move(element); } if (owned_data) { - allocfn_.destroy(allocfn_.address(element)); + std::allocator_traits<allocator_type>::destroy(allocfn_, std::addressof(element)); } } if (owned_data) { |