From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 19 Sep 2025 09:14:39 +0000 (+0100)
Subject: libstdc++: Reorder start_lifetime_as macro in version.def
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acfd5ab079f34caeda595e30ed1a1356ca2e2bd8;p=thirdparty%2Fgcc.git

libstdc++: Reorder start_lifetime_as macro in version.def

libstdc++-v3/ChangeLog:

	* include/bits/version.def (start_lifetime_as): Move adjacent to
	other C++23 macros.
	* include/bits/version.h: Regenerate.
---

diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def
index 77a24badb37..65cd6ab80b8 100644
--- a/libstdc++-v3/include/bits/version.def
+++ b/libstdc++-v3/include/bits/version.def
@@ -1860,6 +1860,14 @@ ftms = {
   };
 };
 
+ftms = {
+  name = start_lifetime_as;
+  values = {
+    v =  202207;
+    cxxmin = 23;
+  };
+};
+
 ftms = {
   name = string_contains;
   values = {
@@ -2117,14 +2125,6 @@ ftms = {
   };
 };
 
-ftms = {
-  name = start_lifetime_as;
-  values = {
-    v =  202207;
-    cxxmin = 23;
-  };
-};
-
 // Standard test specifications.
 stds[97] = ">= 199711L";
 stds[03] = ">= 199711L";
diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h
index 2d03702c3c8..af50ce4b362 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -2078,6 +2078,16 @@
 #endif /* !defined(__cpp_lib_stacktrace) && defined(__glibcxx_want_stacktrace) */
 #undef __glibcxx_want_stacktrace
 
+#if !defined(__cpp_lib_start_lifetime_as)
+# if (__cplusplus >= 202100L)
+#  define __glibcxx_start_lifetime_as 202207L
+#  if defined(__glibcxx_want_all) || defined(__glibcxx_want_start_lifetime_as)
+#   define __cpp_lib_start_lifetime_as 202207L
+#  endif
+# endif
+#endif /* !defined(__cpp_lib_start_lifetime_as) && defined(__glibcxx_want_start_lifetime_as) */
+#undef __glibcxx_want_start_lifetime_as
+
 #if !defined(__cpp_lib_string_contains)
 # if (__cplusplus >= 202100L) && _GLIBCXX_HOSTED
 #  define __glibcxx_string_contains 202011L
@@ -2372,14 +2382,4 @@
 #endif /* !defined(__cpp_lib_constexpr_exceptions) && defined(__glibcxx_want_constexpr_exceptions) */
 #undef __glibcxx_want_constexpr_exceptions
 
-#if !defined(__cpp_lib_start_lifetime_as)
-# if (__cplusplus >= 202100L)
-#  define __glibcxx_start_lifetime_as 202207L
-#  if defined(__glibcxx_want_all) || defined(__glibcxx_want_start_lifetime_as)
-#   define __cpp_lib_start_lifetime_as 202207L
-#  endif
-# endif
-#endif /* !defined(__cpp_lib_start_lifetime_as) && defined(__glibcxx_want_start_lifetime_as) */
-#undef __glibcxx_want_start_lifetime_as
-
 #undef __glibcxx_want_all