diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2025-12-06 20:24:15 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2026-05-29 22:57:28 +0000 |
| commit | f17eb2277e6e3ee1cd91bbb9a2810c260a3de838 (patch) | |
| tree | bbe0bde3c5bf017435dbdc49b54b08ebf6e6283c | |
| parent | b247a3c78f115a47b3f8978e48a0df6c1798e48b (diff) | |
Revert "libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed:"
This reverts commit f7570f1eb0dc056dfce9d7500157538c670edaf6, in
preparation for merging llvm 21.
PR: 292067
MFC after: 1 month
(cherry picked from commit a843ea3f246f3f137722db556aa07710e6a84b71)
| -rw-r--r-- | contrib/llvm-project/libcxx/include/__format/format_arg.h | 1 | ||||
| -rw-r--r-- | contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/contrib/llvm-project/libcxx/include/__format/format_arg.h b/contrib/llvm-project/libcxx/include/__format/format_arg.h index 4924e5fb3253..aa02f81dc40e 100644 --- a/contrib/llvm-project/libcxx/include/__format/format_arg.h +++ b/contrib/llvm-project/libcxx/include/__format/format_arg.h @@ -19,6 +19,7 @@ #include <__fwd/format.h> #include <__memory/addressof.h> #include <__type_traits/conditional.h> +#include <__type_traits/remove_const.h> #include <__utility/forward.h> #include <__utility/move.h> #include <__utility/unreachable.h> diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index 8e1c04336432..2c4e9e419a1b 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -10,8 +10,6 @@ #define _LIBCPP___TYPE_TRAITS_REMOVE_CV_H #include <__config> -#include <__type_traits/remove_const.h> -#include <__type_traits/remove_volatile.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header |