From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 2DEB03858C33; Fri, 22 Mar 2024 22:44:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2DEB03858C33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1711147479; bh=/cr+pGtecUFqkNq4JEVFs+30SxtgwSMziBq4Dt8WWcI=; h=From:To:Subject:Date:From; b=mZ7zYiB/NLCWE6Skd7bkWOV9vTHbMCenheuxAt2TH5BTg+U6L6WXBqKVQGbMTlDPY flkqZuyXWjLXhMVYDUluER8M3hLCcC8olTQVlyHk0Kz7BOBxYNAqFcp7IdsMgiLJVv 9FweSbQ+cxHt+ZZsr7xO9QJ1+htCEsu2Y6wzhFUA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-9633] libstdc++: Reorder feature test macro definitions X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 31ef58b18da930b09ea0dfc1d6533c5ef97d8446 X-Git-Newrev: ff773ac3d9c2bec21fa1a56cad99d63a1cf2a74f Message-Id: <20240322224439.2DEB03858C33@sourceware.org> Date: Fri, 22 Mar 2024 22:44:39 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ff773ac3d9c2bec21fa1a56cad99d63a1cf2a74f commit r14-9633-gff773ac3d9c2bec21fa1a56cad99d63a1cf2a74f Author: Jonathan Wakely Date: Fri Mar 22 10:51:01 2024 +0000 libstdc++: Reorder feature test macro definitions 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. 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 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