From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id B137A3857C58; Thu, 21 Oct 2021 01:38:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B137A3857C58 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-4589] libstdc++: Implement LWG 3590-3592 changes to split_view/lazy_split_view X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 6667274b0593a64dd3de3c7c3565bec42af35b62 X-Git-Newrev: 2d3ac6039074832978ce9bcd41ba93ef4812458f Message-Id: <20211021013855.B137A3857C58@sourceware.org> Date: Thu, 21 Oct 2021 01:38:55 +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: Thu, 21 Oct 2021 01:38:55 -0000 https://gcc.gnu.org/g:2d3ac6039074832978ce9bcd41ba93ef4812458f commit r12-4589-g2d3ac6039074832978ce9bcd41ba93ef4812458f Author: Patrick Palka Date: Wed Oct 20 21:34:23 2021 -0400 libstdc++: Implement LWG 3590-3592 changes to split_view/lazy_split_view libstdc++-v3/ChangeLog: * include/std/ranges (lazy_split_view::base): Add forward_range constraint as per LWG 3591. (lazy_split_view::begin, lazy_split_view::end): Also check simpleness of _Pattern as per LWG 3592. (split_view::base): Relax copyable constraint as per LWG 3590. Diff: --- libstdc++-v3/include/std/ranges | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c1519c7dbd5..30ba0606869 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3137,7 +3137,7 @@ namespace views::__adaptor { return _M_i_current(); } constexpr iterator_t<_Base> - base() && + base() && requires forward_range<_Vp> { return std::move(_M_i_current()); } constexpr decltype(auto) @@ -3229,8 +3229,11 @@ namespace views::__adaptor begin() { if constexpr (forward_range<_Vp>) - return _OuterIter<__detail::__simple_view<_Vp>>{ - this, ranges::begin(_M_base)}; + { + constexpr bool __simple + = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>; + return _OuterIter<__simple>{this, ranges::begin(_M_base)}; + } else { _M_current = ranges::begin(_M_base); @@ -3247,8 +3250,9 @@ namespace views::__adaptor constexpr auto end() requires forward_range<_Vp> && common_range<_Vp> { - return _OuterIter<__detail::__simple_view<_Vp>>{ - this, ranges::end(_M_base)}; + constexpr bool __simple + = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>; + return _OuterIter<__simple>{this, ranges::end(_M_base)}; } constexpr auto @@ -3339,7 +3343,7 @@ namespace views::__adaptor { } constexpr _Vp - base() const& requires copyable<_Vp> + base() const& requires copy_constructible<_Vp> { return _M_base; } constexpr _Vp