public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-4589] libstdc++: Implement LWG 3590-3592 changes to split_view/lazy_split_view
@ 2021-10-21  1:38 Patrick Palka
  0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2021-10-21  1:38 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

https://gcc.gnu.org/g:2d3ac6039074832978ce9bcd41ba93ef4812458f

commit r12-4589-g2d3ac6039074832978ce9bcd41ba93ef4812458f
Author: Patrick Palka <ppalka@redhat.com>
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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-21  1:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-21  1:38 [gcc r12-4589] libstdc++: Implement LWG 3590-3592 changes to split_view/lazy_split_view Patrick Palka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).