diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-04-22 22:54:34 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-04-22 22:54:34 +0100 |
| commit | eca477d16c3fd4ef1fbd559ccff11ec778d387bc (patch) | |
| tree | af44fbff2e332ca0e529c0750d7c835672745fbd /libstdc++-v3 | |
| parent | 56772f623e2270f0c6bfaf64e0bb41d4b6085dc4 (diff) | |
libstdc++: Rename __cpp_lib_constexpr_invoke macro
This macro was renamed after it was added to the working draft, but we
never renamed it in libstdc++. We haven't made a release with the old
macro name, so I see no need to keep it around.
* include/std/functional (__cpp_lib_constexpr_invoke): Rename to
__cpp_lib_constexpr_functional.
* include/std/version (__cpp_lib_constexpr_invoke): Likewise.
* testsuite/20_util/function_objects/invoke/constexpr.cc: Adjust.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/version | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 182f5dc4b7e..7053a63ee91 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-04-22 Jonathan Wakely <jwakely@redhat.com> + * include/std/functional (__cpp_lib_constexpr_invoke): Rename to + __cpp_lib_constexpr_functional. + * include/std/version (__cpp_lib_constexpr_invoke): Likewise. + * testsuite/20_util/function_objects/invoke/constexpr.cc: Adjust. + * include/bits/ptr_traits.h (__cpp_lib_constexpr_memory): Define to indicate P1006R1 support. (__cpp_lib_to_address): Define to indicate P0653R2 support. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index faa7e85c114..2a9b2a003db 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -76,7 +76,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >= 201703L # define __cpp_lib_invoke 201411L # if __cplusplus > 201703L -# define __cpp_lib_constexpr_invoke 201907L +# define __cpp_lib_constexpr_functional 201907L # endif /// Invoke a callable object. diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 3b1fd700069..77255915c4d 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -190,7 +190,7 @@ #define __cpp_lib_constexpr_algorithms 201806L #define __cpp_lib_constexpr_complex 201711L #define __cpp_lib_constexpr_dynamic_alloc 201907L -#define __cpp_lib_constexpr_invoke 201907L +#define __cpp_lib_constexpr_functional 201907L #define __cpp_lib_constexpr_memory 201811L #define __cpp_lib_constexpr_numeric 201911L #define __cpp_lib_erase_if 202002L diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc index 89cb9ca0fcc..3df48d44f49 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/constexpr.cc @@ -20,9 +20,9 @@ #include <functional> -#ifndef __cpp_lib_constexpr_invoke +#ifndef __cpp_lib_constexpr_functional # error "Feature test macro for constexpr invoke is missing" -#elif __cpp_lib_constexpr_invoke < 201907L +#elif __cpp_lib_constexpr_functional < 201907L # error "Feature test macro for constexpr invoke has wrong value" #endif |