https://gcc.gnu.org/g:d024be89712c9e1c175793717dfc23e635b66254

commit r15-3770-gd024be89712c9e1c175793717dfc23e635b66254
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Fri Sep 13 10:20:01 2024 +0100

    libstdc++: Reorder C++26 entries in version.def
    
    This puts the C++26 ftms definitions in alphabetical order.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/version.def: Sort C++26 entries alphabetically.
            * include/bits/version.h: Regenerate.

Diff:
---
 libstdc++-v3/include/bits/version.def | 34 ++++++++++++++---------------
 libstdc++-v3/include/bits/version.h   | 40 +++++++++++++++++------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/libstdc++-v3/include/bits/version.def 
b/libstdc++-v3/include/bits/version.def
index c12b0de61598..f2e28175b087 100644
--- a/libstdc++-v3/include/bits/version.def
+++ b/libstdc++-v3/include/bits/version.def
@@ -1789,6 +1789,15 @@ ftms = {
   };
 };
 
+ftms = {
+  name = constexpr_new;
+  values = {
+    v = 202406;
+    cxxmin = 26;
+    extra_cond = "__cpp_constexpr >= 202406L";
+  };
+};
+
 ftms = {
   name = fstream_native_handle;
   values = {
@@ -1798,6 +1807,14 @@ ftms = {
   };
 };
 
+ftms = {
+  name = ranges_concat;
+  values = {
+    v = 202403;
+    cxxmin = 26;
+  };
+};
+
 ftms = {
   name = ratio;
   values = {
@@ -1842,23 +1859,6 @@ ftms = {
   };
 };
 
-ftms = {
-  name = ranges_concat;
-  values = {
-    v = 202403;
-    cxxmin = 26;
-  };
-};
-
-ftms = {
-  name = constexpr_new;
-  values = {
-    v = 202406;
-    cxxmin = 26;
-    extra_cond = "__cpp_constexpr >= 202406L";
-  };
-};
-
 // 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 4738def977fe..22526e851457 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -1978,6 +1978,16 @@
 #endif /* !defined(__cpp_lib_algorithm_default_value_type) && 
defined(__glibcxx_want_algorithm_default_value_type) */
 #undef __glibcxx_want_algorithm_default_value_type
 
+#if !defined(__cpp_lib_constexpr_new)
+# if (__cplusplus >  202302L) && (__cpp_constexpr >= 202406L)
+#  define __glibcxx_constexpr_new 202406L
+#  if defined(__glibcxx_want_all) || defined(__glibcxx_want_constexpr_new)
+#   define __cpp_lib_constexpr_new 202406L
+#  endif
+# endif
+#endif /* !defined(__cpp_lib_constexpr_new) && 
defined(__glibcxx_want_constexpr_new) */
+#undef __glibcxx_want_constexpr_new
+
 #if !defined(__cpp_lib_fstream_native_handle)
 # if (__cplusplus >  202302L) && _GLIBCXX_HOSTED
 #  define __glibcxx_fstream_native_handle 202306L
@@ -1988,6 +1998,16 @@
 #endif /* !defined(__cpp_lib_fstream_native_handle) && 
defined(__glibcxx_want_fstream_native_handle) */
 #undef __glibcxx_want_fstream_native_handle
 
+#if !defined(__cpp_lib_ranges_concat)
+# if (__cplusplus >  202302L)
+#  define __glibcxx_ranges_concat 202403L
+#  if defined(__glibcxx_want_all) || defined(__glibcxx_want_ranges_concat)
+#   define __cpp_lib_ranges_concat 202403L
+#  endif
+# endif
+#endif /* !defined(__cpp_lib_ranges_concat) && 
defined(__glibcxx_want_ranges_concat) */
+#undef __glibcxx_want_ranges_concat
+
 #if !defined(__cpp_lib_ratio)
 # if (__cplusplus >  202302L)
 #  define __glibcxx_ratio 202306L
@@ -2038,24 +2058,4 @@
 #endif /* !defined(__cpp_lib_to_string) && defined(__glibcxx_want_to_string) */
 #undef __glibcxx_want_to_string
 
-#if !defined(__cpp_lib_ranges_concat)
-# if (__cplusplus >  202302L)
-#  define __glibcxx_ranges_concat 202403L
-#  if defined(__glibcxx_want_all) || defined(__glibcxx_want_ranges_concat)
-#   define __cpp_lib_ranges_concat 202403L
-#  endif
-# endif
-#endif /* !defined(__cpp_lib_ranges_concat) && 
defined(__glibcxx_want_ranges_concat) */
-#undef __glibcxx_want_ranges_concat
-
-#if !defined(__cpp_lib_constexpr_new)
-# if (__cplusplus >  202302L) && (__cpp_constexpr >= 202406L)
-#  define __glibcxx_constexpr_new 202406L
-#  if defined(__glibcxx_want_all) || defined(__glibcxx_want_constexpr_new)
-#   define __cpp_lib_constexpr_new 202406L
-#  endif
-# endif
-#endif /* !defined(__cpp_lib_constexpr_new) && 
defined(__glibcxx_want_constexpr_new) */
-#undef __glibcxx_want_constexpr_new
-
 #undef __glibcxx_want_all

Reply via email to