public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-335] libstdc++: Fix inconsistent feature test macros Date: Fri, 30 Apr 2021 21:00:24 +0000 (GMT) [thread overview] Message-ID: <20210430210024.F3454385803C@sourceware.org> (raw) https://gcc.gnu.org/g:3215d4f5b3d08e0087a88df9e155c779927ace1a commit r12-335-g3215d4f5b3d08e0087a88df9e155c779927ace1a Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Apr 30 20:32:05 2021 +0100 libstdc++: Fix inconsistent feature test macros The __cpp_lib_constexpr_string and __cpp_lib_semaphore feature test macros are not defined consistently in <version> and the relevant header for the feature. libstdc++-v3/ChangeLog: * include/bits/basic_string.h (__cpp_lib_constexpr_string): Only define for C++17 and later. * include/std/version (__cpp_lib_semaphore): Fix condition to match the one in <semaphore>. Diff: --- libstdc++-v3/include/bits/basic_string.h | 2 +- libstdc++-v3/include/std/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 41d781c698e..fba7c6f3354 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -55,7 +55,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus == 201703L // Support P0426R1 changes to char_traits in C++17. # define __cpp_lib_constexpr_string 201611L -#else +#elif __cplusplus > 201703L // Also support P1032R1 in C++20 (but not P0980R1 yet). # define __cpp_lib_constexpr_string 201811L #endif diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 09e67a40d0c..ea0e18a3f9d 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -241,7 +241,7 @@ #if __cpp_lib_concepts # define __cpp_lib_ranges 201911L #endif -#if __cpp_lib_atomic_wait +#if __cpp_lib_atomic_wait || _GLIBCXX_HAVE_POSIX_SEMAPHORE # define __cpp_lib_semaphore 201907L #endif #define __cpp_lib_shift 201806L
reply other threads:[~2021-04-30 21:00 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210430210024.F3454385803C@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).