From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 8 Dec 2023 14:40:26 +0000 (+0000)
Subject: libstdc++: Fix value of __cpp_lib_format macro [PR111826]
X-Git-Tag: releases/gcc-13.3.0~641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f5011f9e6e347e0b91f47a118a0ce58a2c2d99a;p=thirdparty%2Fgcc.git

libstdc++: Fix value of __cpp_lib_format macro [PR111826]

As noted in the PR, we support both features required for the 202110L
value, so we should define it with that value.

libstdc++-v3/ChangeLog:

	PR libstdc++/111826
	* include/std/format (__cpp_lib_format): Update value.
	* include/std/version (__cpp_lib_format): Likewise.
	* testsuite/std/format/functions/format.cc: Update expected
	value.

(cherry picked from commit cdf45e00a936a76a785c592c9730f24ef1ac25cd)
---

diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format
index 88510ccf60e0..f454c49e12d6 100644
--- a/libstdc++-v3/include/std/format
+++ b/libstdc++-v3/include/std/format
@@ -64,7 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 // 202106 std::format improvements.
 // 202110 Fixing locale handling in chrono formatters, generator-like types.
 // 202207 Encodings in localized formatting of chrono, basic-format-string.
-#define __cpp_lib_format 202106L
+#define __cpp_lib_format 202110L
 
 #if __cplusplus > 202002L
 // 202207 P2286R8 Formatting Ranges
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 02ead8f1443e..31e79bc6f40e 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -294,7 +294,7 @@
 #endif
 #define __cpp_lib_constexpr_vector 201907L
 #define __cpp_lib_erase_if 202002L
-#define __cpp_lib_format 202106L
+#define __cpp_lib_format 202110L
 #define __cpp_lib_generic_unordered_lookup 201811L
 #ifdef _GLIBCXX_HAS_GTHREADS
 # define __cpp_lib_jthread 201911L
diff --git a/libstdc++-v3/testsuite/std/format/functions/format.cc b/libstdc++-v3/testsuite/std/format/functions/format.cc
index 59ed3be8baa3..b8ad4f1ed29b 100644
--- a/libstdc++-v3/testsuite/std/format/functions/format.cc
+++ b/libstdc++-v3/testsuite/std/format/functions/format.cc
@@ -6,7 +6,7 @@
 
 #ifndef __cpp_lib_format
 # error "Feature test macro for std::format is missing in <format>"
-#elif __cpp_lib_format < 202106L
+#elif __cpp_lib_format < 202110L
 # error "Feature test macro for std::format has wrong value in <format>"
 #endif
 
@@ -14,7 +14,7 @@
 #include <version>
 #ifndef __cpp_lib_format
 # error "Feature test macro for std::format is missing in <version>"
-#elif __cpp_lib_format < 202106L
+#elif __cpp_lib_format < 202110L
 # error "Feature test macro for std::format has wrong value in <version>"
 #endif