aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2026-02-14 23:19:40 +0000
committerDimitry Andric <dim@FreeBSD.org>2026-04-25 14:14:22 +0000
commit0f15398d123a9cf02711efddf5e4040f0066c6de (patch)
tree573475e9f606f1e7c2a182d4116fb8285e1d16f6
parent1dfe63e4f75fa2a8c94aaf4aefaf48d164bc90db (diff)
Fixup mismerge in __cxx03/__type_traits/add_[lr]value_reference.h.
PR: 292067 MFC after: 1 month
-rw-r--r--contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h2
-rw-r--r--contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h2
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);