The submdspan feature is complete and this commit sets the feature
testing macros accordingly. Also makes the feature testing macro
submdspan depend on constant_wrapper.

libstdc++-v3/ChangeLog:

        * include/bits/version.def (submdspan): Set to 202411 add
        dependency.
        * include/bits/version.h: Regenerate.

Signed-off-by: Luc Grosheintz <[email protected]>
---
 libstdc++-v3/include/bits/version.def | 4 ++--
 libstdc++-v3/include/bits/version.h   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/include/bits/version.def 
b/libstdc++-v3/include/bits/version.def
index 394ebf4c989..f11c75f55d7 100644
--- a/libstdc++-v3/include/bits/version.def
+++ b/libstdc++-v3/include/bits/version.def
@@ -1069,24 +1069,24 @@ ftms = {
   values = {
     v = 202411;
     cxxmin = 26;
     extra_cond = "__glibcxx_assume_aligned "
     "&& __glibcxx_is_sufficiently_aligned";
     };
 };
 
 ftms = {
   name = submdspan;
-  no_stdname = true; // TODO: change once complete
   values = {
-    v = 1;
+    v = 202411;
     cxxmin = 26;
+    extra_cond = "__glibcxx_constant_wrapper >= 202506L";
   };
 };
 
 ftms = {
   name = ssize;
   values = {
     v = 201902;
     cxxmin = 20;
   };
 };
diff --git a/libstdc++-v3/include/bits/version.h 
b/libstdc++-v3/include/bits/version.h
index 141c90d47ce..8c35e74fcdb 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -1197,23 +1197,24 @@
 # if (__cplusplus >  202302L) && (__glibcxx_assume_aligned && 
__glibcxx_is_sufficiently_aligned)
 #  define __glibcxx_aligned_accessor 202411L
 #  if defined(__glibcxx_want_all) || defined(__glibcxx_want_aligned_accessor)
 #   define __cpp_lib_aligned_accessor 202411L
 #  endif
 # endif
 #endif /* !defined(__cpp_lib_aligned_accessor) */
 #undef __glibcxx_want_aligned_accessor
 
 #if !defined(__cpp_lib_submdspan)
-# if (__cplusplus >  202302L)
-#  define __glibcxx_submdspan 1L
+# if (__cplusplus >  202302L) && (__glibcxx_constant_wrapper >= 202506L)
+#  define __glibcxx_submdspan 202411L
 #  if defined(__glibcxx_want_all) || defined(__glibcxx_want_submdspan)
+#   define __cpp_lib_submdspan 202411L
 #  endif
 # endif
 #endif /* !defined(__cpp_lib_submdspan) */
 #undef __glibcxx_want_submdspan
 
 #if !defined(__cpp_lib_ssize)
 # if (__cplusplus >= 202002L)
 #  define __glibcxx_ssize 201902L
 #  if defined(__glibcxx_want_all) || defined(__glibcxx_want_ssize)
 #   define __cpp_lib_ssize 201902L
-- 
2.51.2

Reply via email to