From 71966e25ac5fa02f9fd78d92d338012b60398c25 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 11 Jan 2024 23:09:45 +0000 Subject: [PATCH] libstdc++: Fix incorrect PR number in comment libstdc++-v3/ChangeLog: * include/std/format (__format::_Arg_store): Fix PR number in comment. Simplify preprocessor code. (cherry picked from commit e9035183a20af10a80a97b57accb76699c9c2530) --- libstdc++-v3/include/std/format | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index d7feca0f6aa7..d5ca962423cf 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -3316,12 +3316,9 @@ namespace __format friend std::basic_format_args<_Context>; template - friend auto + friend auto std:: #if _GLIBCXX_INLINE_VERSION - // Needed for PR c++/59526 - std::__8:: -#else - std:: + __8:: // Needed for PR c++/59256 #endif make_format_args(_Argz&&...) noexcept; -- 2.47.2