diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-04-23 21:39:33 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-04-23 21:39:33 +0100 |
| commit | 40541efe1c063e9ce894b5f11ff727e4aec56e8b (patch) | |
| tree | 45f59965e31bcc915289cb97da5aed3abb4461ca /libstdc++-v3 | |
| parent | a2dcb56c9443d1211e14889bd0c2c21360d54cdb (diff) | |
libstdc++: Change __cpp_lib_array_constexpr for C++17 again
This partially reverts my previous change related to this macro. The
C++20 constexpr iterator requirements are always met by array:iterator,
because it's just a pointer. So the macro can be set to 201803 even in
C++17 mode.
* include/bits/stl_iterator.h (__cpp_lib_array_constexpr): Revert
value for C++17 to 201803L because P0858R0 is supported for C++17.
* include/std/version (__cpp_lib_array_constexpr): Likewise.
* testsuite/23_containers/array/element_access/constexpr_c++17.cc:
Check for value corresponding to P0031R0 features being tested.
* testsuite/23_containers/array/requirements/constexpr_iter.cc:
Check for value corresponding to P0858R0 features being tested.
Diffstat (limited to 'libstdc++-v3')
5 files changed, 14 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 52535464984..7ce32b9348b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2020-04-23 Jonathan Wakely <jwakely@redhat.com> + * include/bits/stl_iterator.h (__cpp_lib_array_constexpr): Revert + value for C++17 to 201803L because P0858R0 is supported for C++17. + * include/std/version (__cpp_lib_array_constexpr): Likewise. + * testsuite/23_containers/array/element_access/constexpr_c++17.cc: + Check for value corresponding to P0031R0 features being tested. + * testsuite/23_containers/array/requirements/constexpr_iter.cc: + Check for value corresponding to P0858R0 features being tested. + * include/std/version (__cpp_lib_three_way_comparison): Define for freestanding builds. diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index d7e85b84041..cc0b3e0a766 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -72,7 +72,7 @@ #if __cplusplus > 201703L # define __cpp_lib_array_constexpr 201811L #elif __cplusplus == 201703L -# define __cpp_lib_array_constexpr 201603L +# define __cpp_lib_array_constexpr 201803L #endif #if __cplusplus > 201703L diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 1beb9aa938e..fa505f25e98 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -123,7 +123,7 @@ #if _GLIBCXX_HOSTED #define __cpp_lib_any 201606L #define __cpp_lib_apply 201603 -#define __cpp_lib_array_constexpr 201603L +#define __cpp_lib_array_constexpr 201803L #define __cpp_lib_as_const 201510 #define __cpp_lib_boyer_moore_searcher 201603 #define __cpp_lib_chrono 201611 diff --git a/libstdc++-v3/testsuite/23_containers/array/element_access/constexpr_c++17.cc b/libstdc++-v3/testsuite/23_containers/array/element_access/constexpr_c++17.cc index 56d1cf256be..dd69645833f 100644 --- a/libstdc++-v3/testsuite/23_containers/array/element_access/constexpr_c++17.cc +++ b/libstdc++-v3/testsuite/23_containers/array/element_access/constexpr_c++17.cc @@ -24,8 +24,6 @@ # error "Feature test macro for array constexpr is missing in <array>" #elif __cpp_lib_array_constexpr < 201603L # error "Feature test macro for array constexpr has wrong value in <array>" -#elif __cpp_lib_array_constexpr > 201603L && __cplusplus == 201703 -# error "Feature test macro for array constexpr has wrong value for C++17" #endif constexpr std::size_t test01() diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_iter.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_iter.cc index a119937f773..566388405b6 100644 --- a/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_iter.cc +++ b/libstdc++-v3/testsuite/23_containers/array/requirements/constexpr_iter.cc @@ -22,12 +22,13 @@ #ifndef __cpp_lib_array_constexpr # error "Feature test macro for array constexpr is missing in <array>" -#elif __cpp_lib_array_constexpr < 201603L +#elif __cpp_lib_array_constexpr < 201803L # error "Feature test macro for array constexpr has wrong value in <array>" -#elif __cpp_lib_array_constexpr > 201603L && __cplusplus == 201703 -# error "Feature test macro for array constexpr has wrong value for C++17" #endif +// This test is compiled as C++17 because array::iterator is just a pointer, +// so always meets the C++20 constexpr iterator requirements, even in C++17. + constexpr int test() { |