libstdc++: Update __cpp_lib_concepts value

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7053a63ee918c6b0835bb70b496ef096c1a8ff89..4e86ec188a53218c08d2560983bd72c06ed9e761 100644 (file)
--- 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 e8ce1adc93a012bf8726e00b2014cc4fd355c097..9ffed7007d9e94ea9a0946fc03be73b007c80211 100644 (file)
--- 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 77255915c4d3bd8bd116d9e79bcf9e75c2a6c584..85bc142bc38ebf09a57a8864194c54aeb2c8ccba 100644 (file)
--- 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 41726faa731126d4f3aeee231f681ff8535b45fc..4f5812ce121955c0abe86b152b9781983dc889cf 100644 (file)
--- 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 706de7dd9139236eb59a11dafea5690a7c24aae1..6967c8454a96e5a4b5ef00bc6d8bb64f9b0a13c4 100644 (file)
--- 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