From: François Dumont <fdumont@gcc.gnu.org>
Date: Wed, 23 Aug 2023 17:15:43 +0000 (+0200)
Subject: libstdc++: [_GLIBCXX_INLINE_VERSION] Fix <format> friend declaration
X-Git-Tag: basepoints/gcc-15~6213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92456291849fe88303bbcab366f41dcd4a885ad5;p=thirdparty%2Fgcc.git

libstdc++: [_GLIBCXX_INLINE_VERSION] Fix <format> friend declaration

GCC do not consider the inline namespace in friend function declarations.
This is PR c++/59526, we need to explicit this namespace.

libstdc++-v3/ChangeLog:

	* include/std/format (std::__format::_Arg_store): Explicit version
	namespace on make_format_args friend declaration.
---

diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format
index 128a5b79282e..1e7172575ecc 100644
--- a/libstdc++-v3/include/std/format
+++ b/libstdc++-v3/include/std/format
@@ -3437,7 +3437,13 @@ namespace __format
 
       template<typename _Ctx, typename... _Argz>
 	friend auto
-	std::make_format_args(_Argz&&...) noexcept;
+#if _GLIBCXX_INLINE_VERSION
+	// Needed for PR c++/59526
+	std::__8::
+#else
+	std::
+#endif
+	make_format_args(_Argz&&...) noexcept;
 
       // For a sufficiently small number of arguments we only store values.
       // basic_format_args can get the types from the _Args pack.