git: 436b7b75dac8 - stable/14 - Revert "libcxx-compat: revert llvmorg-19-init-4504-g937a5396cf3e:"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 May 2026 23:03:38 UTC
The branch stable/14 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=436b7b75dac85e9d52810698d601b8503f713691
commit 436b7b75dac85e9d52810698d601b8503f713691
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-06 20:24:15 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-05-29 22:59:33 +0000
Revert "libcxx-compat: revert llvmorg-19-init-4504-g937a5396cf3e:"
This reverts commit a7455c47801ea1e4c4eed10cab2072375f6f92a2, in
preparation for merging llvm 21, in preparation for merging llvm 21.
PR: 292067
MFC after: 1 month
(cherry picked from commit 3ca6facafc4c96fa9d6027b6f3b50b7c3e3a5dbf)
---
contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h
index b378a20cedeb..baa6df94714f 100644
--- a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h
+++ b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h
@@ -11,12 +11,6 @@
#include <__config>
#include <__type_traits/integral_constant.h>
-#include <__type_traits/is_array.h>
-#include <__type_traits/is_function.h>
-#include <__type_traits/is_void.h>
-#include <__type_traits/remove_reference.h>
-#include <__utility/declval.h>
-#include <cstddef>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header