From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id F41DA3857025; Tue, 5 Oct 2021 08:36:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F41DA3857025 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4178] libstdc++: Update __cpp_lib_adaptor_iterator_pair_constructor value X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: bbdf2d3967366db0148dc454172f594a951dbb8b X-Git-Newrev: 9e136807c5b5476ed02a2a40a14fe0df3c0f4f18 Message-Id: <20211005083603.F41DA3857025@sourceware.org> Date: Tue, 5 Oct 2021 08:36:03 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2021 08:36:04 -0000 https://gcc.gnu.org/g:9e136807c5b5476ed02a2a40a14fe0df3c0f4f18 commit r12-4178-g9e136807c5b5476ed02a2a40a14fe0df3c0f4f18 Author: Jonathan Wakely Date: Mon Oct 4 20:16:47 2021 +0100 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. Diff: --- libstdc++-v3/include/bits/stl_queue.h | 2 +- libstdc++-v3/include/bits/stl_stack.h | 2 +- libstdc++-v3/include/std/version | 2 +- libstdc++-v3/testsuite/23_containers/queue/cons_from_iters.cc | 2 +- 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> 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> 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 -#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 #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 -#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 #endif