aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2025-12-06 20:24:14 +0000
committerDimitry Andric <dim@FreeBSD.org>2026-05-29 22:57:28 +0000
commite18613ce216636c6659b76aca3f3e75e3c2c2932 (patch)
tree405f21f06e4f3b4c3865a3c0d2893e64660e44c8
parent1923e6c70dfd5605299c393124ec38a5e84937de (diff)
Revert "libcxx-compat: don't remove headers that were reintroduced by reverts"
This reverts commit 2b3703a4f4519e202c3bdf12e7e13d9b5fdbc3f3, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month (cherry picked from commit 3f6219840dbea7712554982a3c9f852c1c9664f4)
-rw-r--r--ObsoleteFiles.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index c97115393e5d..8e4199465af7 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -1061,6 +1061,8 @@ OLD_FILES+=usr/include/c++/v1/__type_traits/apply_cv.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_copy_assignable.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_copy_constructible.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_default_constructible.h
+OLD_FILES+=usr/include/c++/v1/__type_traits/is_member_function_pointer.h
+OLD_FILES+=usr/include/c++/v1/__type_traits/is_member_object_pointer.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_move_assignable.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_move_constructible.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_copy_assignable.h
@@ -1068,6 +1070,7 @@ OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_copy_constructible.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_default_constructible.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_move_assignable.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_move_constructible.h
+OLD_FILES+=usr/include/c++/v1/__type_traits/is_scoped_enum.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_copy_assignable.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_copy_constructible.h
OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_default_constructible.h