From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 0647C3858C50; Sat, 29 Apr 2023 14:04:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0647C3858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682777054; bh=z8X4IafyM3prANr4r3+CFgs/OFZmFP0weaYgAP1RKAY=; h=From:To:Subject:Date:From; b=Z7ULVIsITBgKnZbDpD765tvLfKJHq6vHiicw+NeskWXmUCa70ojtC6Ze/szgtUi3L r/yIq+P0dFJ25WSLbVAspogicgnvqmNNPABVBkg8QtE5YsagOTaIxuIcduXDwL9fOz K1oz/6nJLOsdqN7vkkPQJXGy/uqWez+JFYpF6PhU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-9498] libstdc++: Implement LWG 3904 change to lazy_split_view's iterator X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: c19da6683bd1d1e3537ce7d8c05f2c595fe98083 X-Git-Newrev: 05476c093a00c4ce31d7a19c72fc83b8796c05fe Message-Id: <20230429140414.0647C3858C50@sourceware.org> Date: Sat, 29 Apr 2023 14:04:14 +0000 (GMT) List-Id: https://gcc.gnu.org/g:05476c093a00c4ce31d7a19c72fc83b8796c05fe commit r12-9498-g05476c093a00c4ce31d7a19c72fc83b8796c05fe Author: Patrick Palka Date: Wed Apr 12 13:08:21 2023 -0400 libstdc++: Implement LWG 3904 change to lazy_split_view's iterator libstdc++-v3/ChangeLog: * include/std/ranges (lazy_split_view::_OuterIter::_OuterIter): Propagate _M_trailing_empty in the const-converting constructor as per LWG 3904. * testsuite/std/ranges/adaptors/lazy_split.cc (test12): New test. (cherry picked from commit aa65771427d32299cffecea64cbb766411aa8faf) Diff: --- libstdc++-v3/include/std/ranges | 3 ++- libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 443fe65da92..bfcc046c496 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3188,7 +3188,8 @@ namespace views::__adaptor _OuterIter(_OuterIter __i) requires _Const && convertible_to, iterator_t<_Base>> - : _M_parent(__i._M_parent), _M_current(std::move(__i._M_current)) + : _M_parent(__i._M_parent), _M_current(std::move(__i._M_current)), + _M_trailing_empty(__i._M_trailing_empty) { } constexpr value_type diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc index 21c0837cdd3..5e1d99f636d 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -218,6 +219,20 @@ test11() static_assert(ranges::distance(views::lazy_split("text"sv, ""sv)) == 4); } +constexpr bool +test12() +{ + // LWG 3904 + auto r = views::single(0) | views::lazy_split(0); + auto i = r.begin(); + ++i; + VERIFY( i != r.end() ); + decltype(std::as_const(r).begin()) j = i; + VERIFY( j != r.end() ); + + return true; +} + int main() { @@ -232,4 +247,5 @@ main() test09(); test10(); test11(); + static_assert(test12()); }