diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-04-22 22:54:35 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-04-22 22:54:35 +0100 |
| commit | 2025db692e9ed1192f831bc122413a226987515c (patch) | |
| tree | eac4fe03bdc3cc236544d46564d0939b20f85d6b /libstdc++-v3 | |
| parent | c9313582d82e0768a3a68250dc97d82a9ad3c116 (diff) | |
libstdc++: Do not define __cpp_lib_constexpr_algorithms in <utility>
The C++20 draft and SD-6 both say this should only be in <version> and
<algorithm>, not in <utility>.
* include/std/utility (__cpp_lib_constexpr_algorithms): Do not define
here.
* testsuite/20_util/exchange/constexpr.cc: Do not expect macro to be
defined by <utility>.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/utility | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/exchange/constexpr.cc | 6 |
3 files changed, 7 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4e86ec188a5..4fec7b21029 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-04-22 Jonathan Wakely <jwakely@redhat.com> + * include/std/utility (__cpp_lib_constexpr_algorithms): Do not define + here. + * testsuite/20_util/exchange/constexpr.cc: Do not expect macro to be + defined by <utility>. + * include/std/functional (__cpp_lib_concepts): Update macro value to indicate P1964R2 support. * include/std/version (__cpp_lib_concepts): Likewise. diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility index dc6e8468af5..5f1675a7679 100644 --- a/libstdc++-v3/include/std/utility +++ b/libstdc++-v3/include/std/utility @@ -238,7 +238,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION get(const std::pair<_Tp1, _Tp2>&& __in) noexcept { return __pair_get<_Int>::__const_move_get(std::move(__in)); } -#if __cplusplus > 201103L +#if __cplusplus >= 201402L #define __cpp_lib_tuples_by_type 201304 @@ -284,10 +284,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #define __cpp_lib_exchange_function 201304 -#if __cplusplus > 201703L -# define __cpp_lib_constexpr_algorithms 201806L -#endif - /// Assign @p __new_val to @p __obj and return its previous value. template <typename _Tp, typename _Up = _Tp> _GLIBCXX20_CONSTEXPR @@ -295,7 +291,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION exchange(_Tp& __obj, _Up&& __new_val) { return std::__exchange(__obj, std::forward<_Up>(__new_val)); } -#endif +#endif // C++14 // Stores a tuple of indices. Used by tuple and pair, and by bind() to // extract the elements in a tuple. diff --git a/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc b/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc index 3673772ea4b..ee6cbaebdee 100644 --- a/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc +++ b/libstdc++-v3/testsuite/20_util/exchange/constexpr.cc @@ -20,12 +20,6 @@ #include <utility> -#ifndef __cpp_lib_constexpr_algorithms -# error "Feature-test macro for constexpr algorithms missing" -#elif __cpp_lib_constexpr_algorithms < 201806L -# error "Feature-test macro for constexpr algorithms has wrong value" -#endif - constexpr bool test() { |