From f6eea9486ae1935017f42d1f89005ddafb0bd53a Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 25 Jan 2018 10:52:02 -0800 Subject: Changes imported from Abseil "staging" branch: - a74a7e9027e3f90835ae0f553f98be294781da18 Internal change by Abseil Team - 2d32db6ed063f93b67886b9c27602d5aea3c21f7 Add /D_SCL_SECURE_NO_WARNINGS to MSVC builds to disable c... by Jon Cohen - 54f40318d1de67b6b25f8aa68343f8bbcde8c304 Use sized delete in FixedArray. by Chris Kennelly - 193f50b3500ab1a102a00df4e05ad7b969e9337b Fixes some warnings that show up during builds with msvc. by Greg Miller GitOrigin-RevId: a74a7e9027e3f90835ae0f553f98be294781da18 Change-Id: I6d2b1f496974a1399ca5db6b71274368c2699a59 --- absl/container/fixed_array.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'absl/container/fixed_array.h') diff --git a/absl/container/fixed_array.h b/absl/container/fixed_array.h index 1fec9d2..b92d905 100644 --- a/absl/container/fixed_array.h +++ b/absl/container/fixed_array.h @@ -458,7 +458,7 @@ class FixedArray { // Loop optimizes to nothing for trivially destructible T. for (Holder* p = end(); p != begin();) (--p)->~Holder(); if (IsAllocated(size())) { - ::operator delete[](begin()); + std::allocator().deallocate(p_, n_); } else { this->AnnotateDestruct(size()); } @@ -470,17 +470,13 @@ class FixedArray { private: Holder* MakeHolder(size_type n) { if (IsAllocated(n)) { - return Allocate(n); + return std::allocator().allocate(n); } else { this->AnnotateConstruct(n); return this->data(); } } - Holder* Allocate(size_type n) { - return static_cast(::operator new[](n * sizeof(Holder))); - } - bool IsAllocated(size_type n) const { return n > inline_elements; } const size_type n_; -- cgit v1.2.3