From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 69EA1385842B; Sat, 9 Dec 2023 22:04:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69EA1385842B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1702159495; bh=waGQGQNvh00BZNgB5vtq2817av0HRmfsjXxNvH2e2Q0=; h=From:To:Subject:Date:From; b=r/P2B+db2aryMhZboZTOZp2G1FsjOxXrIVcrJMHT4xNPG/EvJ/r0oq91VxSeOtWR+ fCdzNvg7XnpksdfarHbl4MxQVaxR+KXe8NnR6Gqb1T6L5FVLsOEX3yreMB1oC2F7Qo b0fNG+sbQigDMUVNHVSli8XXF0NVhG2qqgC6Xfs8= 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 r13-8140] libstdc++: Fix value of __cpp_lib_format macro [PR111826] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 1f10823731394b19b4d2e466b35cdccd18efba37 X-Git-Newrev: 9f5011f9e6e347e0b91f47a118a0ce58a2c2d99a Message-Id: <20231209220455.69EA1385842B@sourceware.org> Date: Sat, 9 Dec 2023 22:04:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9f5011f9e6e347e0b91f47a118a0ce58a2c2d99a commit r13-8140-g9f5011f9e6e347e0b91f47a118a0ce58a2c2d99a Author: Jonathan Wakely Date: Fri Dec 8 14:40:26 2023 +0000 libstdc++: Fix value of __cpp_lib_format macro [PR111826] As noted in the PR, we support both features required for the 202110L value, so we should define it with that value. libstdc++-v3/ChangeLog: PR libstdc++/111826 * include/std/format (__cpp_lib_format): Update value. * include/std/version (__cpp_lib_format): Likewise. * testsuite/std/format/functions/format.cc: Update expected value. (cherry picked from commit cdf45e00a936a76a785c592c9730f24ef1ac25cd) Diff: --- libstdc++-v3/include/std/format | 2 +- libstdc++-v3/include/std/version | 2 +- libstdc++-v3/testsuite/std/format/functions/format.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 88510ccf60e..f454c49e12d 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -64,7 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 202106 std::format improvements. // 202110 Fixing locale handling in chrono formatters, generator-like types. // 202207 Encodings in localized formatting of chrono, basic-format-string. -#define __cpp_lib_format 202106L +#define __cpp_lib_format 202110L #if __cplusplus > 202002L // 202207 P2286R8 Formatting Ranges diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 02ead8f1443..31e79bc6f40 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -294,7 +294,7 @@ #endif #define __cpp_lib_constexpr_vector 201907L #define __cpp_lib_erase_if 202002L -#define __cpp_lib_format 202106L +#define __cpp_lib_format 202110L #define __cpp_lib_generic_unordered_lookup 201811L #ifdef _GLIBCXX_HAS_GTHREADS # define __cpp_lib_jthread 201911L diff --git a/libstdc++-v3/testsuite/std/format/functions/format.cc b/libstdc++-v3/testsuite/std/format/functions/format.cc index 59ed3be8baa..b8ad4f1ed29 100644 --- a/libstdc++-v3/testsuite/std/format/functions/format.cc +++ b/libstdc++-v3/testsuite/std/format/functions/format.cc @@ -6,7 +6,7 @@ #ifndef __cpp_lib_format # error "Feature test macro for std::format is missing in " -#elif __cpp_lib_format < 202106L +#elif __cpp_lib_format < 202110L # error "Feature test macro for std::format has wrong value in " #endif @@ -14,7 +14,7 @@ #include #ifndef __cpp_lib_format # error "Feature test macro for std::format is missing in " -#elif __cpp_lib_format < 202106L +#elif __cpp_lib_format < 202110L # error "Feature test macro for std::format has wrong value in " #endif