From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 89C5D385803D; Tue, 12 Apr 2022 14:28:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89C5D385803D 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 r11-9820] libstdc++: Implement LWG 3591-3592 changes to split_view X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: b0561bc86b3d70f823b506c6baa738303869dda1 X-Git-Newrev: 130b959f23396fd71b135b8cef67e10a95487902 Message-Id: <20220412142853.89C5D385803D@sourceware.org> Date: Tue, 12 Apr 2022 14:28:53 +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, 12 Apr 2022 14:28:53 -0000 https://gcc.gnu.org/g:130b959f23396fd71b135b8cef67e10a95487902 commit r11-9820-g130b959f23396fd71b135b8cef67e10a95487902 Author: Patrick Palka Date: Wed Oct 20 21:34:23 2021 -0400 libstdc++: Implement LWG 3591-3592 changes to split_view libstdc++-v3/ChangeLog: * include/std/ranges (split_view::base): Add forward_range constraint as per LWG 3591. (split_view::begin, lazy_split_view::end): Also check simpleness of _Pattern as per LWG 3592. (cherry picked from commit 2d3ac6039074832978ce9bcd41ba93ef4812458f) Diff: --- libstdc++-v3/include/std/ranges | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 52ca9080759..f55ee15e1b1 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3072,7 +3072,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) @@ -3166,8 +3166,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); @@ -3184,8 +3187,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