From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed 5/8] libstdc++: Update __cpp_lib_concepts value
Date: Wed, 22 Apr 2020 22:59:01 +0100 [thread overview]
Message-ID: <c9313582d82e0768a3a68250dc97d82a9ad3c116.1587592482.git.jwakely@redhat.com> (raw)
In-Reply-To: <cover.1587592482.git.jwakely@redhat.com>
* include/std/functional (__cpp_lib_concepts): Update macro value to
indicate P1964R2 support.
* include/std/version (__cpp_lib_concepts): Likewise.
* testsuite/std/concepts/1.cc: Adjust expected value.
* testsuite/std/concepts/2.cc: Likewise.
---
libstdc++-v3/ChangeLog | 6 ++++++
libstdc++-v3/include/std/concepts | 2 +-
libstdc++-v3/include/std/version | 2 +-
libstdc++-v3/testsuite/std/concepts/1.cc | 2 +-
libstdc++-v3/testsuite/std/concepts/2.cc | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7053a63ee91..4e86ec188a5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
2020-04-22 Jonathan Wakely <jwakely@redhat.com>
+ * include/std/functional (__cpp_lib_concepts): Update macro value to
+ indicate P1964R2 support.
+ * include/std/version (__cpp_lib_concepts): Likewise.
+ * testsuite/std/concepts/1.cc: Adjust expected value.
+ * testsuite/std/concepts/2.cc: Likewise.
+
* include/std/functional (__cpp_lib_constexpr_invoke): Rename to
__cpp_lib_constexpr_functional.
* include/std/version (__cpp_lib_constexpr_invoke): Likewise.
diff --git a/libstdc++-v3/include/std/concepts b/libstdc++-v3/include/std/concepts
index e8ce1adc93a..9ffed7007d9 100644
--- a/libstdc++-v3/include/std/concepts
+++ b/libstdc++-v3/include/std/concepts
@@ -47,7 +47,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
-#define __cpp_lib_concepts 201806L
+#define __cpp_lib_concepts 202002L
// [concepts.lang], language-related concepts
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 77255915c4d..85bc142bc38 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -168,7 +168,7 @@
#define __cpp_lib_bounded_array_traits 201902L
// __cpp_lib_char8_t is defined in <bits/c++config.h>
#if __cpp_concepts >= 201907L
-# define __cpp_lib_concepts 201806L
+# define __cpp_lib_concepts 202002L
#endif
#if __cpp_impl_destroying_delete
# define __cpp_lib_destroying_delete 201806L
diff --git a/libstdc++-v3/testsuite/std/concepts/1.cc b/libstdc++-v3/testsuite/std/concepts/1.cc
index 41726faa731..4f5812ce121 100644
--- a/libstdc++-v3/testsuite/std/concepts/1.cc
+++ b/libstdc++-v3/testsuite/std/concepts/1.cc
@@ -22,6 +22,6 @@
#ifndef __cpp_lib_concepts
# error "Feature test macro for concepts is missing in <concepts>"
-#elif __cpp_lib_concepts < 201806L
+#elif __cpp_lib_concepts < 202002L
# error "Feature test macro for concepts has wrong value in <concepts>"
#endif
diff --git a/libstdc++-v3/testsuite/std/concepts/2.cc b/libstdc++-v3/testsuite/std/concepts/2.cc
index 706de7dd913..6967c8454a9 100644
--- a/libstdc++-v3/testsuite/std/concepts/2.cc
+++ b/libstdc++-v3/testsuite/std/concepts/2.cc
@@ -22,6 +22,6 @@
#ifndef __cpp_lib_concepts
# error "Feature test macro for concepts is missing in <version>"
-#elif __cpp_lib_concepts < 201806L
+#elif __cpp_lib_concepts < 202002L
# error "Feature test macro for concepts has wrong value in <version>"
#endif
--
2.25.3
next prev parent reply other threads:[~2020-04-22 21:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 21:57 [committed 0/8] libstdc++: Add/update/fix feature test macros Jonathan Wakely
2020-04-22 21:58 ` [committed 1/8] libstdc++: Update value of __cpp_lib_jthread macro Jonathan Wakely
2020-04-22 21:58 ` [committed 2/8] libstdc++: Remove non-standard feature test macros Jonathan Wakely
2020-04-22 21:58 ` [committed 3/8] libstdc++: Add missing " Jonathan Wakely
2020-04-22 21:58 ` [committed 4/8] libstdc++: Rename __cpp_lib_constexpr_invoke macro Jonathan Wakely
2020-04-22 21:59 ` Jonathan Wakely [this message]
2020-04-22 21:59 ` [committed 6/8] libstdc++: Do not define __cpp_lib_constexpr_algorithms in <utility> Jonathan Wakely
2020-04-22 21:59 ` [committed 7/8] libstdc++: Update (and revert) value of __cpp_lib_array_constexpr Jonathan Wakely
2020-04-23 20:44 ` Jonathan Wakely
2020-04-22 21:59 ` [committed 8/8] libstdc++: Define __cpp_lib_execution feature test macro Jonathan Wakely
2020-04-23 20:41 ` [committed 9/8] libstdc++: Define __cpp_lib_three_way_comparison for freestanding Jonathan Wakely
2020-04-23 20:46 ` [committed 0/8] libstdc++: Add/update/fix feature test macros Jonathan Wakely
2020-04-28 22:52 ` [committed 10/8] libstdc++: Fixes for feature test macros (PR 91480) Jonathan Wakely
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=c9313582d82e0768a3a68250dc97d82a9ad3c116.1587592482.git.jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@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: link
Be 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).