git: 5945da0bc9ac - main - Revert "libcxx-compat: update libcxx.imp for headers that were reintroduced by reverts"

The branch main has been updated by dim:

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

commit 5945da0bc9ac42f531b1079a246eb8ce4f0d63db
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-06 20:24:14 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-04-25 14:07:40 +0000

    Revert "libcxx-compat: update libcxx.imp for headers that were reintroduced by reverts"
    
    This reverts commit caf0ccccc304e3e7938c9722f1deb0a362fd70d5, in
    preparation for merging llvm 21.
    
    PR:             292067
    MFC after:      1 month
---
 lib/libc++/libcxx.imp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/libc++/libcxx.imp b/lib/libc++/libcxx.imp
index 73c9d62df329..214c12cd40ed 100644
--- a/lib/libc++/libcxx.imp
+++ b/lib/libc++/libcxx.imp
@@ -774,8 +774,6 @@
   { include: [ "<__type_traits/is_implicitly_default_constructible.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_integral.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_literal_type.h>", "private", "<type_traits>", "public" ] },
-  { include: [ "<__type_traits/is_member_function_pointer.h>", "private", "<type_traits>", "public" ] },
-  { include: [ "<__type_traits/is_member_object_pointer.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_member_pointer.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_nothrow_assignable.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_nothrow_constructible.h>", "private", "<type_traits>", "public" ] },
@@ -792,7 +790,6 @@
   { include: [ "<__type_traits/is_referenceable.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_same.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_scalar.h>", "private", "<type_traits>", "public" ] },
-  { include: [ "<__type_traits/is_scoped_enum.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_signed.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_signed_integer.h>", "private", "<type_traits>", "public" ] },
   { include: [ "<__type_traits/is_specialization.h>", "private", "<type_traits>", "public" ] },