git: cfbe04310e25 - stable/15 - Revert "libcxx-compat: revert llvmorg-19-init-18063-g561246e90282:"

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Fri, 29 May 2026 23:01:09 UTC
The branch stable/15 has been updated by dim:

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

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

    Revert "libcxx-compat: revert llvmorg-19-init-18063-g561246e90282:"
    
    This reverts commit 1d99ada3215dbc28665fe051f9ccf028a2a02ce8, in
    preparation for merging llvm 21.
    
    PR:             292067
    MFC after:      1 month
    
    (cherry picked from commit 6243d755fb82e62d2a3a2e031801e0443150454a)
---
 contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h
index 2c4e9e419a1b..50e9f3e8aa78 100644
--- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h
+++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h
@@ -28,7 +28,7 @@ using __remove_cv_t = typename remove_cv<_Tp>::type;
 #else
 template <class _Tp>
 using __remove_cv_t = __remove_cv(_Tp);
-#endif // __has_builtin(__remove_cv)
+#endif
 
 #if _LIBCPP_STD_VER >= 14
 template <class _Tp>