Date: Sat, 25 Apr 2026 14:18:37 +0000 From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a843ea3f246f - main - Revert "libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed:" Message-ID: <69eccd3d.37a92.e37fbec@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a843ea3f246f3f137722db556aa07710e6a84b71 commit a843ea3f246f3f137722db556aa07710e6a84b71 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-04-25 14:07:42 +0000 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 --- contrib/llvm-project/libcxx/include/__format/format_arg.h | 1 + contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 -- 2 files changed, 1 insertion(+), 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_headerhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69eccd3d.37a92.e37fbec>