diff options
| author | Patrick Palka <ppalka@redhat.com> | 2021-10-20 21:34:23 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2021-10-20 21:34:23 -0400 |
| commit | 2d3ac6039074832978ce9bcd41ba93ef4812458f (patch) | |
| tree | dd086d37ed52db3a9a913e7e48954fd676f41e9e | |
| parent | 6667274b0593a64dd3de3c7c3565bec42af35b62 (diff) | |
| download | gcc-2d3ac6039074832978ce9bcd41ba93ef4812458f.zip gcc-2d3ac6039074832978ce9bcd41ba93ef4812458f.tar.gz gcc-2d3ac6039074832978ce9bcd41ba93ef4812458f.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/include/std/ranges | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c1519c7..30ba060 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 |