From e2026d74f61c4883d7ac834773ed9dca6d9cc30a Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 8 Dec 2025 21:23:46 +0100 Subject: [PATCH] libstdc++: Set __cpp_lib_submdspan to 202411. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. Also changes the value of the internal feature testing macro for padded layouts to 202403. libstdc++-v3/ChangeLog: * include/bits/version.def (padded_layouts): Set to 202403. (submdspan): Set to 202411 add dependency. * include/bits/version.h: Regenerate. Reviewed-by: Tomasz Kamiński Signed-off-by: Luc Grosheintz --- libstdc++-v3/include/bits/version.def | 6 +++--- libstdc++-v3/include/bits/version.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def index bbc8d383938..5c010a4f770 100644 --- a/libstdc++-v3/include/bits/version.def +++ b/libstdc++-v3/include/bits/version.def @@ -1094,17 +1094,17 @@ ftms = { name = padded_layouts; no_stdname = true; // internal values = { - v = 1; + v = 202403; cxxmin = 26; }; }; ftms = { name = submdspan; - no_stdname = true; // TODO: change once complete values = { - v = 1; + v = 202411; cxxmin = 26; + extra_cond = "__glibcxx_constant_wrapper >= 202506L"; }; }; diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h index 7ee9ae84215..219f4bb4341 100644 --- a/libstdc++-v3/include/bits/version.h +++ b/libstdc++-v3/include/bits/version.h @@ -1214,7 +1214,7 @@ #if !defined(__cpp_lib_padded_layouts) # if (__cplusplus > 202302L) -# define __glibcxx_padded_layouts 1L +# define __glibcxx_padded_layouts 202403L # if defined(__glibcxx_want_all) || defined(__glibcxx_want_padded_layouts) # endif # endif @@ -1222,9 +1222,10 @@ #undef __glibcxx_want_padded_layouts #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) */ -- 2.47.3