The branch main has been updated by arichardson:
URL:
https://cgit.FreeBSD.org/src/commit/?id=086ce467adec42d58414fdb4d54c2b6819cf0c07
commit 086ce467adec42d58414fdb4d54c2b6819cf0c07
Author: Alex Richardson <arichard...@freebsd.org>
AuthorDate: 2025-09-15 22:13:46 +0000
Commit: Alex Richardson <arichard...@freebsd.org>
CommitDate: 2025-09-15 22:13:46 +0000
libc++: Fix deprecation warnings with latest clang
Latest clang has become more strict in diagnosing deprecated decls, so
pull in LLVM commit 9feac2cbd0d80927ce9a8b4c3e810d2b81802d55.
Original commit message:
[libc++] Improve deprecated diagnostic guards.
Recent Clang-21 builds improved the deprecated diagnotics. This
uncovered missing guards in libc++ internally.
Reviewed by: dim
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D52531
---
contrib/llvm-project/libcxx/include/__functional/binary_function.h | 5 ++---
contrib/llvm-project/libcxx/include/__functional/unary_function.h | 5 ++---
contrib/llvm-project/libcxx/include/__functional/weak_result_type.h | 2 ++
contrib/llvm-project/libcxx/include/__memory/allocator_traits.h | 2 ++
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/contrib/llvm-project/libcxx/include/__functional/binary_function.h
b/contrib/llvm-project/libcxx/include/__functional/binary_function.h
index ddee3b170311..18879f65112b 100644
--- a/contrib/llvm-project/libcxx/include/__functional/binary_function.h
+++ b/contrib/llvm-project/libcxx/include/__functional/binary_function.h
@@ -39,11 +39,10 @@ struct __binary_function_keep_layout_base {
};
#if _LIBCPP_STD_VER <= 14 ||
defined(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
-_LIBCPP_DIAGNOSTIC_PUSH
-_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
template <class _Arg1, class _Arg2, class _Result>
using __binary_function = binary_function<_Arg1, _Arg2, _Result>;
-_LIBCPP_DIAGNOSTIC_POP
+_LIBCPP_SUPPRESS_DEPRECATED_POP
#else
template <class _Arg1, class _Arg2, class _Result>
using __binary_function = __binary_function_keep_layout_base<_Arg1, _Arg2,
_Result>;
diff --git a/contrib/llvm-project/libcxx/include/__functional/unary_function.h
b/contrib/llvm-project/libcxx/include/__functional/unary_function.h
index 69b1bc94220a..d46df2e86fbd 100644
--- a/contrib/llvm-project/libcxx/include/__functional/unary_function.h
+++ b/contrib/llvm-project/libcxx/include/__functional/unary_function.h
@@ -36,11 +36,10 @@ struct __unary_function_keep_layout_base {
};
#if _LIBCPP_STD_VER <= 14 ||
defined(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
-_LIBCPP_DIAGNOSTIC_PUSH
-_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
template <class _Arg, class _Result>
using __unary_function = unary_function<_Arg, _Result>;
-_LIBCPP_DIAGNOSTIC_POP
+_LIBCPP_SUPPRESS_DEPRECATED_POP
#else
template <class _Arg, class _Result>
using __unary_function = __unary_function_keep_layout_base<_Arg, _Result>;
diff --git
a/contrib/llvm-project/libcxx/include/__functional/weak_result_type.h
b/contrib/llvm-project/libcxx/include/__functional/weak_result_type.h
index ad7a8395186c..488fec9dac21 100644
--- a/contrib/llvm-project/libcxx/include/__functional/weak_result_type.h
+++ b/contrib/llvm-project/libcxx/include/__functional/weak_result_type.h
@@ -77,6 +77,7 @@ struct __maybe_derive_from_unary_function // bool is true
template <class _Tp>
struct __maybe_derive_from_unary_function<_Tp, false> {};
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
template <class _Tp, bool = __derives_from_binary_function<_Tp>::value>
struct __maybe_derive_from_binary_function // bool is true
: public __derives_from_binary_function<_Tp>::type {};
@@ -99,6 +100,7 @@ struct __weak_result_type_imp<_Tp, false>
template <class _Tp>
struct __weak_result_type : public __weak_result_type_imp<_Tp> {};
+_LIBCPP_SUPPRESS_DEPRECATED_POP
// 0 argument case
diff --git a/contrib/llvm-project/libcxx/include/__memory/allocator_traits.h
b/contrib/llvm-project/libcxx/include/__memory/allocator_traits.h
index c5fcc89327b8..f3e327edda12 100644
--- a/contrib/llvm-project/libcxx/include/__memory/allocator_traits.h
+++ b/contrib/llvm-project/libcxx/include/__memory/allocator_traits.h
@@ -40,6 +40,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
template <class _Tp>
\
struct NAME<_Tp, __void_t<typename _Tp::PROPERTY > > : true_type {}
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
// __pointer
template <class _Tp,
class _Alloc,
@@ -67,6 +68,7 @@ struct __const_pointer<_Tp, _Ptr, _Alloc, false> {
using type _LIBCPP_NODEBUG = typename pointer_traits<_Ptr>::template
rebind<const _Tp>;
#endif
};
+_LIBCPP_SUPPRESS_DEPRECATED_POP
// __void_pointer
_LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(__has_void_pointer, void_pointer);
