Tested aarch64-linux. Pushed to trunk.
-- >8 --
Put the C++23 generator and tuple_like ones before the C++26 ones.
libstdc++-v3/ChangeLog:
* include/bits/version.def (generator, tuple_like): Move earlier
in the file.
* include/bits/version.h: Regenerate.
---
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 26e62c6a9b2..5ad44941bff 100644
--- a/libstdc++-v3/include/bits/version.def
+++ b/libstdc++-v3/include/bits/version.def
@@ -1637,6 +1637,15 @@ ftms = {
};
};
+ftms = {
+ name = generator;
+ values = {
+ v = 202207;
+ cxxmin = 23;
+ extra_cond = "__glibcxx_coroutine";
+ };
+};
+
ftms = {
name = ios_noreplace;
values = {
@@ -1718,6 +1727,14 @@ ftms = {
};
};
+ftms = {
+ name = tuple_like;
+ values = {
+ v = 202207;
+ cxxmin = 23;
+ };
+};
+
ftms = {
name = unreachable;
values = {
@@ -1771,23 +1788,6 @@ ftms = {
};
};
-ftms = {
- name = generator;
- values = {
- v = 202207;
- cxxmin = 23;
- extra_cond = "__glibcxx_coroutine";
- };
-};
-
-ftms = {
- name = tuple_like;
- 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 23c8c09ab4b..460a3e0116a 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -1823,6 +1823,16 @@
#endif /* !defined(__cpp_lib_forward_like) &&
defined(__glibcxx_want_forward_like) */
#undef __glibcxx_want_forward_like
+#if !defined(__cpp_lib_generator)
+# if (__cplusplus >= 202100L) && (__glibcxx_coroutine)
+# define __glibcxx_generator 202207L
+# if defined(__glibcxx_want_all) || defined(__glibcxx_want_generator)
+# define __cpp_lib_generator 202207L
+# endif
+# endif
+#endif /* !defined(__cpp_lib_generator) && defined(__glibcxx_want_generator) */
+#undef __glibcxx_want_generator
+
#if !defined(__cpp_lib_ios_noreplace)
# if (__cplusplus >= 202100L) && _GLIBCXX_HOSTED
# define __glibcxx_ios_noreplace 202207L
@@ -1913,6 +1923,16 @@
#endif /* !defined(__cpp_lib_to_underlying) &&
defined(__glibcxx_want_to_underlying) */
#undef __glibcxx_want_to_underlying
+#if !defined(__cpp_lib_tuple_like)
+# if (__cplusplus >= 202100L)
+# define __glibcxx_tuple_like 202207L
+# if defined(__glibcxx_want_all) || defined(__glibcxx_want_tuple_like)
+# define __cpp_lib_tuple_like 202207L
+# endif
+# endif
+#endif /* !defined(__cpp_lib_tuple_like) && defined(__glibcxx_want_tuple_like)
*/
+#undef __glibcxx_want_tuple_like
+
#if !defined(__cpp_lib_unreachable)
# if (__cplusplus >= 202100L)
# define __glibcxx_unreachable 202202L
@@ -1973,24 +1993,4 @@
#endif /* !defined(__cpp_lib_to_string) && defined(__glibcxx_want_to_string) */
#undef __glibcxx_want_to_string
-#if !defined(__cpp_lib_generator)
-# if (__cplusplus >= 202100L) && (__glibcxx_coroutine)
-# define __glibcxx_generator 202207L
-# if defined(__glibcxx_want_all) || defined(__glibcxx_want_generator)
-# define __cpp_lib_generator 202207L
-# endif
-# endif
-#endif /* !defined(__cpp_lib_generator) && defined(__glibcxx_want_generator) */
-#undef __glibcxx_want_generator
-
-#if !defined(__cpp_lib_tuple_like)
-# if (__cplusplus >= 202100L)
-# define __glibcxx_tuple_like 202207L
-# if defined(__glibcxx_want_all) || defined(__glibcxx_want_tuple_like)
-# define __cpp_lib_tuple_like 202207L
-# endif
-# endif
-#endif /* !defined(__cpp_lib_tuple_like) && defined(__glibcxx_want_tuple_like)
*/
-#undef __glibcxx_want_tuple_like
-
#undef __glibcxx_want_all
--
2.44.0
