public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r8-10935] libstdc++: Fix inconsistent feature test macro
@ 2021-04-30 22:02 Jonathan Wakely
  0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2021-04-30 22:02 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

https://gcc.gnu.org/g:d3879001ee42af0f09b5f3b54d8b3d90398532d4

commit r8-10935-gd3879001ee42af0f09b5f3b54d8b3d90398532d4
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Apr 30 20:32:05 2021 +0100

    libstdc++: Fix inconsistent feature test macro
    
    The __cpp_lib_constexpr_string feature test macro is not defined
    consistently in <version> and <string>.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/basic_string.h (__cpp_lib_constexpr_string):
            Only define for C++17 and later.
    
    (cherry picked from commit 3215d4f5b3d08e0087a88df9e155c779927ace1a)

Diff:
---
 libstdc++-v3/include/bits/basic_string.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 0be11c0c444..5eede562884 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -52,7 +52,10 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#define __cpp_lib_constexpr_string 201611L
+#if __cplusplus >= 201703L
+// Support P0426R1 changes to char_traits in C++17.
+# define __cpp_lib_constexpr_string 201611L
+#endif
 
 #if _GLIBCXX_USE_CXX11_ABI
 _GLIBCXX_BEGIN_NAMESPACE_CXX11


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2021-04-30 22:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-30 22:02 [gcc r8-10935] libstdc++: Fix inconsistent feature test macro Jonathan Wakely

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).