From c9313582d82e0768a3a68250dc97d82a9ad3c116 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 22 Apr 2020 22:54:34 +0100 Subject: [PATCH] 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. --- 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 + * 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 #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 " -#elif __cpp_lib_concepts < 201806L +#elif __cpp_lib_concepts < 202002L # error "Feature test macro for concepts has wrong value in " #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 " -#elif __cpp_lib_concepts < 201806L +#elif __cpp_lib_concepts < 202002L # error "Feature test macro for concepts has wrong value in " #endif -- 2.30.2