From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 51E25385800E; Fri, 5 Aug 2022 12:32:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 51E25385800E 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 r12-8664] libstdc++: Update value of __cpp_lib_ios_noreplace macro X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 99679c0ff73a1e60963c57758836e6d7feca311d X-Git-Newrev: 3a9dcef5c195c053cba0103fe3e60fab1b8905df Message-Id: <20220805123212.51E25385800E@sourceware.org> Date: Fri, 5 Aug 2022 12:32:12 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 12:32:12 -0000 https://gcc.gnu.org/g:3a9dcef5c195c053cba0103fe3e60fab1b8905df commit r12-8664-g3a9dcef5c195c053cba0103fe3e60fab1b8905df Author: Jonathan Wakely Date: Thu Aug 4 10:18:23 2022 +0100 libstdc++: Update value of __cpp_lib_ios_noreplace macro My P2467R1 proposal was accepted for C++23 so there's an official value for this macro now. libstdc++-v3/ChangeLog: * include/bits/ios_base.h (__cpp_lib_ios_noreplace): Update value to 202207L. * include/std/version (__cpp_lib_ios_noreplace): Likewise. * testsuite/27_io/basic_ofstream/open/char/noreplace.cc: Check for new value. * testsuite/27_io/basic_ofstream/open/wchar_t/noreplace.cc: Likewise. (cherry picked from commit 3e9bd6b2b1782891639fa5d49b7d2a933b8e85cd) Diff: --- libstdc++-v3/include/bits/ios_base.h | 2 +- libstdc++-v3/include/std/version | 2 +- libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/noreplace.cc | 4 ++-- libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/noreplace.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index bdb30140536..2c33003ed07 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -470,7 +470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static const openmode __noreplace = _S_noreplace; #if __cplusplus >= 202100L -#define __cpp_lib_ios_noreplace 202200L +#define __cpp_lib_ios_noreplace 202207L /// Open a file in exclusive mode. static const openmode noreplace = _S_noreplace; #endif diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 22280e1a349..dcc5008d8a5 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -315,7 +315,7 @@ # define __cpp_lib_expected 202202L #endif #define __cpp_lib_invoke_r 202106L -#define __cpp_lib_ios_noreplace 202200L +#define __cpp_lib_ios_noreplace 202207L #if __cpp_lib_concepts # undef __cpp_lib_optional # define __cpp_lib_optional 202110L diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/noreplace.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/noreplace.cc index e39f5928a1f..56ff2d7cead 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/noreplace.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/noreplace.cc @@ -2,10 +2,10 @@ #include -#if __cplusplus >= 202200L +#if __cplusplus >= 202207L #ifndef __cpp_lib_ios_noreplace # error "Feature-test macro for ios::noreplace missing in " -#elif __cpp_lib_ios_noreplace < 202200L +#elif __cpp_lib_ios_noreplace < 202207L # error "Feature-test macro for ios::noreplace has wrong value in " #endif #endif diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/noreplace.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/noreplace.cc index 77f11865ac4..f0425cdab3d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/noreplace.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/noreplace.cc @@ -2,10 +2,10 @@ #include -#if __cplusplus >= 202200L +#if __cplusplus >= 202207L #ifndef __cpp_lib_ios_noreplace # error "Feature-test macro for ios::noreplace missing in " -#elif __cpp_lib_ios_noreplace < 202200L +#elif __cpp_lib_ios_noreplace < 202207L # error "Feature-test macro for ios::noreplace has wrong value in " #endif #endif