From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id DB99C38293FB; Fri, 27 May 2022 17:34:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB99C38293FB 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-8425] libstdc++: Add constexpr to std::counted_iterator post-increment (LWG 3643) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 5647e401bb8656d1d9897c7a536bf00ff50fd20b X-Git-Newrev: 7be1dd924db806175ddb3c4eb34390d4981cbf11 Message-Id: <20220527173400.DB99C38293FB@sourceware.org> Date: Fri, 27 May 2022 17:34:00 +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: Fri, 27 May 2022 17:34:01 -0000 https://gcc.gnu.org/g:7be1dd924db806175ddb3c4eb34390d4981cbf11 commit r12-8425-g7be1dd924db806175ddb3c4eb34390d4981cbf11 Author: Jonathan Wakely Date: Thu May 26 12:41:03 2022 +0100 libstdc++: Add constexpr to std::counted_iterator post-increment (LWG 3643) libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (counted_iterator::operator++(int)): Add 'constexpr' as per LWG 3643. * testsuite/24_iterators/counted_iterator/lwg3643.cc: New test. (cherry picked from commit 47b20d027ade5bfbd932724d0ea2aedee7421243) Diff: --- libstdc++-v3/include/bits/stl_iterator.h | 3 +-- .../24_iterators/counted_iterator/lwg3643.cc | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 6a9fd1ba48e..12a89ab229f 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -2341,7 +2341,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } - decltype(auto) + constexpr decltype(auto) operator++(int) { __glibcxx_assert(_M_length > 0); @@ -2353,7 +2353,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ++_M_length; __throw_exception_again; } - } constexpr counted_iterator diff --git a/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc new file mode 100644 index 00000000000..e6f12b46c12 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3643.cc @@ -0,0 +1,27 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include + +struct InputIterator +{ + using difference_type = int; + using value_type = int; + + constexpr int operator*() const noexcept { return 0; } + InputIterator& operator++() { return *this; } + constexpr void operator++(int) { } +}; + +static_assert( std::input_iterator ); +static_assert( !std::forward_iterator ); + +constexpr bool +test_lwg3643() +{ + std::counted_iterator iter({}, 1); + iter++; + return iter == std::default_sentinel; +} + +static_assert( test_lwg3643() );