diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-10-04 20:16:47 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-10-05 09:35:46 +0100 |
| commit | 9e136807c5b5476ed02a2a40a14fe0df3c0f4f18 (patch) | |
| tree | 14dd1d079fa3022fe7c64f24211f5d6446901fed | |
| parent | bbdf2d3967366db0148dc454172f594a951dbb8b (diff) | |
| download | gcc-9e136807c5b5476ed02a2a40a14fe0df3c0f4f18.tar.gz | |
libstdc++: Update __cpp_lib_adaptor_iterator_pair_constructor value
I started implementing this feature before it was voted into the C++ WP,
and forgot to update the feature test macro after it was approved.
This defines it to the correct value, as specified in the C++23 draft.
libstdc++-v3/ChangeLog:
* include/bits/stl_queue.h
(__cpp_lib_adaptor_iterator_pair_constructor): Set to correct
value.
* include/bits/stl_stack.h
(__cpp_lib_adaptor_iterator_pair_constructor): Likewise.
* include/std/version
(__cpp_lib_adaptor_iterator_pair_constructor): Likewise.
* testsuite/23_containers/queue/cons_from_iters.cc: Update
expected value.
* testsuite/23_containers/stack/cons_from_iters.cc: Likewise.
| -rw-r--r-- | libstdc++-v3/include/bits/stl_queue.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_stack.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/version | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 3da65c78eb8..68cfe865147 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -196,7 +196,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : c(std::move(__q.c), __a) { } #if __cplusplus > 202002L -#define __cpp_lib_adaptor_iterator_pair_constructor 202100L +#define __cpp_lib_adaptor_iterator_pair_constructor 202106L template<typename _InputIterator, typename = _RequireInputIter<_InputIterator>> diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index f04fa6af479..429743f5514 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -171,7 +171,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : c(std::move(__c)) { } #if __cplusplus > 202002L -#define __cpp_lib_adaptor_iterator_pair_constructor 202100L +#define __cpp_lib_adaptor_iterator_pair_constructor 202106L template<typename _InputIterator, typename = _RequireInputIter<_InputIterator>> diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 66b3d1704b7..3d4a4142eec 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -281,7 +281,7 @@ #if __cplusplus > 202002L // c++2b -#define __cpp_lib_adaptor_iterator_pair_constructor 202100L +#define __cpp_lib_adaptor_iterator_pair_constructor 202106L #define __cpp_lib_invoke_r 202106L #define __cpp_lib_is_scoped_enum 202011L #define __cpp_lib_string_contains 202011L diff --git a/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc b/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc index de0fc310c24..b826e745988 100644 --- a/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc +++ b/libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc @@ -22,7 +22,7 @@ #ifndef __cpp_lib_adaptor_iterator_pair_constructor #error Feature test macro for iterator pair constructors is missing in <queue> -#elif __cpp_lib_adaptor_iterator_pair_constructor != 202100L +#elif __cpp_lib_adaptor_iterator_pair_constructor != 202106L #error Feature test macro for iterator pair constructors has wrong value in <queue> #endif diff --git a/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc b/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc index 4c648926d62..ee06679d986 100644 --- a/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc +++ b/libstdc++-v3/testsuite/23_containers/stack/cons_from_iters.cc @@ -22,7 +22,7 @@ #ifndef __cpp_lib_adaptor_iterator_pair_constructor #error Feature test macro for iterator pair constructors is missing in <stack> -#elif __cpp_lib_adaptor_iterator_pair_constructor != 202100L +#elif __cpp_lib_adaptor_iterator_pair_constructor != 202106L #error Feature test macro for iterator pair constructors has wrong value in <stack> #endif |