diff options
| author | Derek Mauro <dmauro@google.com> | 2022-06-09 07:49:38 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-06-09 07:50:21 -0700 |
| commit | 9eff97861b88999428d1254f95c83d94a2e95944 (patch) | |
| tree | c7e8da7cd859195888b7c3349c5b02d157758ed3 /absl/container/fixed_array.h | |
| parent | 7383f346c9e33a08ed2132f117b3de6b13eac173 (diff) | |
| download | abseil-9eff97861b88999428d1254f95c83d94a2e95944.tar.gz abseil-9eff97861b88999428d1254f95c83d94a2e95944.tar.bz2 abseil-9eff97861b88999428d1254f95c83d94a2e95944.zip | |
Fix C++17 constexpr storage deprecation warnings
This change introduces the symbol
ABSL_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL
to guard redundant declarations of static constexpr data
members that are needed prior to C++17.
This change also introduces the symbol
ABSL_INTERNAL_CPLUSPLUS_LANG, which is supposed to be set
to the same value as __cplusplus, except it uses _MSVC_LANG
on MSVC so that the value is correct on MSVC.
Neither of these new symbols should be used outside of Abseil.
Fixes #1191
PiperOrigin-RevId: 453923908
Change-Id: I1316c52c19fa0c168b93cced0c817e4cb7c9c862
Diffstat (limited to 'absl/container/fixed_array.h')
| -rw-r--r-- | absl/container/fixed_array.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/absl/container/fixed_array.h b/absl/container/fixed_array.h index 839ba0bc..2aefae3b 100644 --- a/absl/container/fixed_array.h +++ b/absl/container/fixed_array.h @@ -489,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( |