git: 46400d102766 - stable/13 - libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed:

The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=46400d102766893ea63ef29bb547d95923af0c58

commit 46400d102766893ea63ef29bb547d95923af0c58
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-08-05 20:26:27 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-12-01 12:32:40 +0000

    libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed:
    
      [libc++][NFC] Remove unused includes from <__type_traits/remove_cv.h> (#88752)
    
    PR:             280562
    MFC after:      1 month
    
    (cherry picked from commit 1199d38d8ec764ce8545888b4c091d00441842bf)
---
 contrib/llvm-project/libcxx/include/__format/format_arg.h     | 1 -
 contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/llvm-project/libcxx/include/__format/format_arg.h b/contrib/llvm-project/libcxx/include/__format/format_arg.h
index aa02f81dc40e..4924e5fb3253 100644
--- a/contrib/llvm-project/libcxx/include/__format/format_arg.h
+++ b/contrib/llvm-project/libcxx/include/__format/format_arg.h
@@ -19,7 +19,6 @@
 #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 2c4e9e419a1b..8e1c04336432 100644
--- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h
+++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h
@@ -10,6 +10,8 @@
 #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