summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Copybara-Service <copybara-worker@google.com>2023-06-07 18:46:48 -0700
committerGravatar Copybara-Service <copybara-worker@google.com>2023-06-07 18:46:48 -0700
commitae87791869cacbc125aa708108c4721e51ff703d (patch)
treee5ce2bb22203f5b5874af5d0088f44693f60e2e4
parentd49a30a81e2cb2ea7af308590f359fa4f7a7934e (diff)
parentc3b5a293aa684130320523b2dab63c8a2bb10fec (diff)
Merge pull request #1468 from Romain-Geissler-1A:silence-aligned_storage-warning
PiperOrigin-RevId: 538651091 Change-Id: Id1aa7ab287beb252f4826f70e26b7e3bfa80c462
-rw-r--r--absl/meta/BUILD.bazel1
-rw-r--r--absl/meta/CMakeLists.txt1
-rw-r--r--absl/meta/type_traits.h3
3 files changed, 5 insertions, 0 deletions
diff --git a/absl/meta/BUILD.bazel b/absl/meta/BUILD.bazel
index 125446f9..13051d83 100644
--- a/absl/meta/BUILD.bazel
+++ b/absl/meta/BUILD.bazel
@@ -32,6 +32,7 @@ cc_library(
linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [
"//absl/base:config",
+ "//absl/base:core_headers",
],
)
diff --git a/absl/meta/CMakeLists.txt b/absl/meta/CMakeLists.txt
index bb767d12..d509114c 100644
--- a/absl/meta/CMakeLists.txt
+++ b/absl/meta/CMakeLists.txt
@@ -23,6 +23,7 @@ absl_cc_library(
${ABSL_DEFAULT_COPTS}
DEPS
absl::config
+ absl::core_headers
PUBLIC
)
diff --git a/absl/meta/type_traits.h b/absl/meta/type_traits.h
index abaf96af..4f9ea017 100644
--- a/absl/meta/type_traits.h
+++ b/absl/meta/type_traits.h
@@ -39,6 +39,7 @@
#include <functional>
#include <type_traits>
+#include "absl/base/attributes.h"
#include "absl/base/config.h"
// Defines the default alignment. `__STDCPP_DEFAULT_NEW_ALIGNMENT__` is a C++17
@@ -278,6 +279,7 @@ using remove_extent_t = typename std::remove_extent<T>::type;
template <typename T>
using remove_all_extents_t = typename std::remove_all_extents<T>::type;
+ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
namespace type_traits_internal {
// This trick to retrieve a default alignment is necessary for our
// implementation of aligned_storage_t to be consistent with any
@@ -296,6 +298,7 @@ struct default_alignment_of_aligned_storage<
template <size_t Len, size_t Align = type_traits_internal::
default_alignment_of_aligned_storage<Len>::value>
using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
+ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
template <typename T>
using decay_t = typename std::decay<T>::type;