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.

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 182f5dc4b7eab25d7a7ba6769687a7bcf7442632..7053a63ee918c6b0835bb70b496ef096c1a8ff89 100644 (file)
--- 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 faa7e85c114aeb0adf6cda49b79f9437526480c5..2a9b2a003dbb59166ce76be7f7ec72a4cf03e6ef 100644 (file)
--- 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 3b1fd70006972139c3cd1b34cc4b4c4b5e06536a..77255915c4d3bd8bd116d9e79bcf9e75c2a6c584 100644 (file)
--- 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 89cb9ca0fcccacaa7c20c51ba80b04616074880a..3df48d44f493accbbb2ae8bdb209be66a19eb04b 100644 (file)
--- 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