git: 7210aadecc98 - stable/15 - Fixup mismerge in __cxx03/__type_traits/add_[lr]value_reference.h.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 May 2026 23:02:05 UTC
The branch stable/15 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=7210aadecc9872675641be32310d10dac7b0fefc
commit 7210aadecc9872675641be32310d10dac7b0fefc
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2026-02-14 23:19:40 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-05-29 22:57:32 +0000
Fixup mismerge in __cxx03/__type_traits/add_[lr]value_reference.h.
PR: 292067
MFC after: 1 month
(cherry picked from commit 0f15398d123a9cf02711efddf5e4040f0066c6de)
---
.../libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h | 2 +-
.../libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h
index c2268901b898..862224e526a5 100644
--- a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h
+++ b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h
@@ -18,7 +18,7 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC)
+#if __has_builtin(__add_lvalue_reference)
template <class _Tp>
using __add_lvalue_reference_t = __add_lvalue_reference(_Tp);
diff --git a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h
index d1be75fc837a..bc0adbf66b35 100644
--- a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h
+++ b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h
@@ -18,7 +18,7 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC)
+#if __has_builtin(__add_rvalue_reference)
template <class _Tp>
using __add_rvalue_reference_t = __add_rvalue_reference(_Tp);