aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2025-12-06 20:24:15 +0000
committerDimitry Andric <dim@FreeBSD.org>2026-05-29 22:57:28 +0000
commit67b0fd370bdb67a819e5980db91f49a111b7c1be (patch)
treeed81a52f68a7adb6b16caa6f5e245c61ad04eeef
parent78f59ae2f0171ac918884fcf80b431f71bbf1001 (diff)
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)
-rw-r--r--contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h6
1 files changed, 0 insertions, 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