From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 0097B3857C50; Fri, 16 Jul 2021 13:46:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0097B3857C50 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-2356] libstdc++: Give split_view::_Sentinel a default ctor [PR101214] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: e32234536f361796e7cad8ed69a1c0bb46ee55de X-Git-Newrev: 73464a472aa4e86359f1a5dc529394fe5152fec0 Message-Id: <20210716134657.0097B3857C50@sourceware.org> Date: Fri, 16 Jul 2021 13:46:56 +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: Fri, 16 Jul 2021 13:46:57 -0000 https://gcc.gnu.org/g:73464a472aa4e86359f1a5dc529394fe5152fec0 commit r12-2356-g73464a472aa4e86359f1a5dc529394fe5152fec0 Author: Patrick Palka Date: Fri Jul 16 09:44:32 2021 -0400 libstdc++: Give split_view::_Sentinel a default ctor [PR101214] This gives the new split_view's sentinel type a defaulted default constructor, something which was overlooked in r12-1665. This patch also fixes a couple of other issues with the new split_view as reported in the PR. PR libstdc++/101214 libstdc++-v3/ChangeLog: * include/std/ranges (split_view::split_view): Use std::move. (split_view::_Iterator::_Iterator): Remove redundant default_initializable constraint. (split_view::_Sentinel::_Sentinel): Declare. * testsuite/std/ranges/adaptors/split.cc (test02): New test. Diff: --- libstdc++-v3/include/std/ranges | 6 ++++-- libstdc++-v3/testsuite/std/ranges/adaptors/split.cc | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index f552caa9d5b..df74ac9dc19 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3306,7 +3306,7 @@ namespace views::__adaptor && constructible_from<_Pattern, single_view>> constexpr split_view(_Range&& __r, range_value_t<_Range> __e) - : _M_pattern(views::single(__e)), + : _M_pattern(views::single(std::move(__e))), _M_base(views::all(std::forward<_Range>(__r))) { } @@ -3364,7 +3364,7 @@ namespace views::__adaptor using value_type = subrange>; using difference_type = range_difference_t<_Vp>; - _Iterator() requires default_initializable> = default; + _Iterator() = default; constexpr _Iterator(split_view* __parent, @@ -3429,6 +3429,8 @@ namespace views::__adaptor { return __x._M_cur == _M_end && !__x._M_trailing_empty; } public: + _Sentinel() = default; + constexpr explicit _Sentinel(split_view* __parent) : _M_end(ranges::end(__parent->_M_base)) diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc index 02c6073a503..b4e01fea6e4 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc @@ -46,6 +46,16 @@ test01() VERIFY( ranges::equal(ints, (int[]){1,2,3,4}) ); } +void +test02() +{ + // PR libstdc++/101214 + auto v = views::iota(0) | views::take(5) | views::split(0); + static_assert(!ranges::common_range); + static_assert(std::default_initializable); + static_assert(std::sentinel_for); +} + // The following testcases are adapted from lazy_split.cc. namespace from_lazy_split_cc { @@ -189,6 +199,7 @@ int main() { test01(); + test02(); from_lazy_split_cc::test01(); from_lazy_split_cc::test02();