git: e18613ce2166 - stable/15 - Revert "libcxx-compat: don't remove headers that were reintroduced by reverts"

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Fri, 29 May 2026 23:00:58 UTC

The branch stable/15 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=e18613ce216636c6659b76aca3f3e75e3c2c2932

commit e18613ce216636c6659b76aca3f3e75e3c2c2932
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-06 20:24:14 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-05-29 22:57:28 +0000

    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)
---
 ObsoleteFiles.inc | 3 +++
 1 file changed, 3 insertions(+)

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