diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
| commit | d055841ab4147dac20d5c46d04ca3a2fb13748b7 (patch) | |
| tree | 15a01389c86f10a8844ff2a86bddf46640d065e8 /absl/container/fixed_array.h | |
| parent | 2d23a3e16abfcf8f22ba850d67e972cc77e98874 (diff) | |
| parent | 273292d1cfc0a94a65082ee350509af1d113344d (diff) | |
| download | abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.tar.gz abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.tar.bz2 abseil-d055841ab4147dac20d5c46d04ca3a2fb13748b7.zip | |
Merge new upstream LTS 20220623.0
Diffstat (limited to 'absl/container/fixed_array.h')
| -rw-r--r-- | absl/container/fixed_array.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/absl/container/fixed_array.h b/absl/container/fixed_array.h index fcb3e545..2aefae3b 100644 --- a/absl/container/fixed_array.h +++ b/absl/container/fixed_array.h @@ -73,11 +73,6 @@ constexpr static auto kFixedArrayUseDefault = static_cast<size_t>(-1); // uninitialized (e.g. int, int[4], double), and others default-constructed. // This matches the behavior of c-style arrays and `std::array`, but not // `std::vector`. -// -// Note that `FixedArray` does not provide a public allocator; if it requires a -// heap allocation, it will do so with global `::operator new[]()` and -// `::operator delete[]()`, even if T provides class-scope overrides for these -// operators. template <typename T, size_t N = kFixedArrayUseDefault, typename A = std::allocator<T>> class FixedArray { @@ -494,12 +489,14 @@ class FixedArray { Storage storage_; }; +#ifdef ABSL_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL template <typename T, size_t N, typename A> constexpr size_t FixedArray<T, N, A>::kInlineBytesDefault; template <typename T, size_t N, typename A> constexpr typename FixedArray<T, N, A>::size_type FixedArray<T, N, A>::inline_elements; +#endif template <typename T, size_t N, typename A> void FixedArray<T, N, A>::NonEmptyInlinedStorage::AnnotateConstruct( |