From fefc83638fb69395d259ed245699310610429064 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 21 Aug 2018 08:05:11 -0700 Subject: Export of internal Abseil changes. -- b01400905d2ba23ec9f4541153532eefcfb0d5f5 by Mark Barolak : Tweak the comment for WebSafeBase64Unescape to make it match the style of the other comments in escaping.h. PiperOrigin-RevId: 209596034 -- dd35c55ee538ed458bb32494d87996d6624676df by Abseil Team : Migrate FixedArray from allocator pointers to references. Also updates the name to be more generic as nothing about the implementation was specific to FixedArray's StorageElement* PiperOrigin-RevId: 209438135 GitOrigin-RevId: b01400905d2ba23ec9f4541153532eefcfb0d5f5 Change-Id: I27304e4609708ec24fb19dce1e33215d7e4b5ae9 --- absl/container/fixed_array.h | 21 ++++++++--------- absl/memory/memory.h | 56 ++++++++++++++++++++++++-------------------- absl/strings/escaping.h | 2 +- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/absl/container/fixed_array.h b/absl/container/fixed_array.h index f480047a..d716380a 100644 --- a/absl/container/fixed_array.h +++ b/absl/container/fixed_array.h @@ -138,8 +138,8 @@ class FixedArray { explicit FixedArray(size_type n, const allocator_type& a = allocator_type()) : storage_(n, a) { if (DefaultConstructorIsNonTrivial()) { - memory_internal::ConstructStorage(storage_.alloc(), storage_.begin(), - storage_.end()); + memory_internal::ConstructRange(storage_.alloc(), storage_.begin(), + storage_.end()); } } @@ -147,8 +147,8 @@ class FixedArray { FixedArray(size_type n, const value_type& val, const allocator_type& a = allocator_type()) : storage_(n, a) { - memory_internal::ConstructStorage(storage_.alloc(), storage_.begin(), - storage_.end(), val); + memory_internal::ConstructRange(storage_.alloc(), storage_.begin(), + storage_.end(), val); } // Creates an array initialized with the size and contents of `init_list`. @@ -163,13 +163,12 @@ class FixedArray { FixedArray(Iterator first, Iterator last, const allocator_type& a = allocator_type()) : storage_(std::distance(first, last), a) { - memory_internal::CopyToStorageFromRange(storage_.alloc(), storage_.begin(), - first, last); + memory_internal::CopyRange(storage_.alloc(), storage_.begin(), first, last); } ~FixedArray() noexcept { for (auto* cur = storage_.begin(); cur != storage_.end(); ++cur) { - AllocatorTraits::destroy(*storage_.alloc(), cur); + AllocatorTraits::destroy(storage_.alloc(), cur); } } @@ -446,15 +445,15 @@ class FixedArray { if (UsingInlinedStorage(size())) { InlinedStorage::AnnotateDestruct(size()); } else { - AllocatorTraits::deallocate(*alloc(), AsValueType(begin()), size()); + AllocatorTraits::deallocate(alloc(), AsValueType(begin()), size()); } } size_type size() const { return size_alloc_.template get<0>(); } StorageElement* begin() const { return data_; } StorageElement* end() const { return begin() + size(); } - allocator_type* alloc() { - return std::addressof(size_alloc_.template get<1>()); + allocator_type& alloc() { + return size_alloc_.template get<1>(); } private: @@ -468,7 +467,7 @@ class FixedArray { return InlinedStorage::data(); } else { return reinterpret_cast( - AllocatorTraits::allocate(*alloc(), size())); + AllocatorTraits::allocate(alloc(), size())); } } diff --git a/absl/memory/memory.h b/absl/memory/memory.h index c7caf8b9..a80aab0a 100644 --- a/absl/memory/memory.h +++ b/absl/memory/memory.h @@ -641,55 +641,59 @@ struct default_allocator_is_nothrow : std::false_type {}; #endif namespace memory_internal { -#ifdef ABSL_HAVE_EXCEPTIONS -template -void ConstructStorage(Allocator* alloc, StorageElement* first, - StorageElement* last, const Args&... args) { - for (StorageElement* cur = first; cur != last; ++cur) { +#ifdef ABSL_HAVE_EXCEPTIONS // ConstructRange +template +void ConstructRange(Allocator& alloc, Iterator first, Iterator last, + const Args&... args) { + for (Iterator cur = first; cur != last; ++cur) { try { - std::allocator_traits::construct(*alloc, cur, args...); + std::allocator_traits::construct(alloc, cur, args...); } catch (...) { while (cur != first) { --cur; - std::allocator_traits::destroy(*alloc, cur); + std::allocator_traits::destroy(alloc, cur); } throw; } } } -template -void CopyToStorageFromRange(Allocator* alloc, StorageElement* destination, - Iterator first, Iterator last) { - for (StorageElement* cur = destination; first != last; +#else // ABSL_HAVE_EXCEPTIONS // ConstructRange +template +void ConstructRange(Allocator& alloc, Iterator first, Iterator last, + const Args&... args) { + for (; first != last; ++first) { + std::allocator_traits::construct(alloc, first, args...); + } +} +#endif // ABSL_HAVE_EXCEPTIONS // ConstructRange + +#ifdef ABSL_HAVE_EXCEPTIONS // CopyRange +template +void CopyRange(Allocator& alloc, Iterator destination, InputIterator first, + InputIterator last) { + for (Iterator cur = destination; first != last; static_cast(++cur), static_cast(++first)) { try { - std::allocator_traits::construct(*alloc, cur, *first); + std::allocator_traits::construct(alloc, cur, *first); } catch (...) { while (cur != destination) { --cur; - std::allocator_traits::destroy(*alloc, cur); + std::allocator_traits::destroy(alloc, cur); } throw; } } } -#else // ABSL_HAVE_EXCEPTIONS -template -void ConstructStorage(Allocator* alloc, StorageElement* first, - StorageElement* last, const Args&... args) { - for (; first != last; ++first) { - std::allocator_traits::construct(*alloc, first, args...); - } -} -template -void CopyToStorageFromRange(Allocator* alloc, StorageElement* destination, - Iterator first, Iterator last) { +#else // ABSL_HAVE_EXCEPTIONS // CopyRange +template +void CopyRange(Allocator& alloc, Iterator destination, InputIterator first, + InputIterator last) { for (; first != last; static_cast(++destination), static_cast(++first)) { - std::allocator_traits::construct(*alloc, destination, *first); + std::allocator_traits::construct(alloc, destination, *first); } } -#endif // ABSL_HAVE_EXCEPTIONS +#endif // ABSL_HAVE_EXCEPTIONS // CopyRange } // namespace memory_internal } // namespace absl diff --git a/absl/strings/escaping.h b/absl/strings/escaping.h index 7f1ab96d..5a13b1fb 100644 --- a/absl/strings/escaping.h +++ b/absl/strings/escaping.h @@ -124,7 +124,7 @@ std::string Utf8SafeCHexEscape(absl::string_view src); // characters, `dest` is cleared and returns `false`. bool Base64Unescape(absl::string_view src, std::string* dest); -// WebSafeBase64Unescape(absl::string_view, std::string*) +// WebSafeBase64Unescape() // // Converts a `src` std::string encoded in Base64 to its binary equivalent, writing // it to a `dest` buffer, but using '-' instead of '+', and '_' instead of '/'. -- cgit v1.2.3