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:59:33 +0000
commit2d5521c618b9f6f05bdcc235344ef6c44b7f3eb3 (patch)
tree9be3edea02f75d47d2ce00638b8ba5aabfcbb471
parent51cc09b9d0202d75c6d85304efc99b6fed08ba52 (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 0e834b2faa84..a7a65939485a 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -663,6 +663,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
@@ -670,6 +672,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