From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 3CC7E3858C2F; Thu, 25 Aug 2022 15:11:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3CC7E3858C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661440299; bh=tj2dWJTHQtasRiCMQcnEVzNJKhobp57LD0xKxyGrlnI=; h=From:To:Subject:Date:From; b=Q6OM66qdM4DvEkmJcIjAB0NSX2h3FfiL9c/Gex1WTriqtzLs/9pBQHuXo1jWfq56b 9JF0eJQvXwNU+1Vfn3rDOe7DkFPYzAqKke8xIRw44LWzLBdtvX+ouY21DHsBCDhjl2 /4YuZexMxzVVKsGuszwosWUJysfIkF/XvdGmSjTI= 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 r13-2202] libstdc++: Some minor cleanups X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 585a21bab3ec688c2039bff2922cc372d8558283 X-Git-Newrev: 980e0aa0ce3bdfec61ca766a71a31a89c12f882e Message-Id: <20220825151139.3CC7E3858C2F@sourceware.org> Date: Thu, 25 Aug 2022 15:11:39 +0000 (GMT) List-Id: https://gcc.gnu.org/g:980e0aa0ce3bdfec61ca766a71a31a89c12f882e commit r13-2202-g980e0aa0ce3bdfec61ca766a71a31a89c12f882e Author: Patrick Palka Date: Thu Aug 25 11:11:04 2022 -0400 libstdc++: Some minor cleanups libstdc++-v3/ChangeLog: * include/std/ranges (lazy_split_view::_OuterIter::_M_current): Remove redundant comment. (lazy_split_view::_M_current): Likewise. (common_view::common_view): Remove commented out view-converting constructor as per LWG3405. (elements_view::_Iterator::_Iterator): Uglify 'current' and 'i'. Diff: --- libstdc++-v3/include/std/ranges | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c600bad6283..fb815c48f99 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3116,7 +3116,6 @@ namespace views::__adaptor _Parent* _M_parent = nullptr; - // XXX: _M_current is present only if "V models forward_range" [[no_unique_address]] __detail::__maybe_present_t, iterator_t<_Base>> _M_current; @@ -3370,7 +3369,6 @@ namespace views::__adaptor _Vp _M_base = _Vp(); _Pattern _M_pattern = _Pattern(); - // XXX: _M_current is "present only if !forward_range" [[no_unique_address]] __detail::__maybe_present_t, __detail::__non_propagating_cache>> _M_current; @@ -3725,16 +3723,6 @@ namespace views::__adaptor : _M_base(std::move(__r)) { } - /* XXX: LWG 3280 didn't remove this constructor, but I think it should? - template - requires (!common_range<_Range>) - && constructible_from<_Vp, views::all_t<_Range>> - constexpr explicit - common_view(_Range&& __r) - : _M_base(views::all(std::forward<_Range>(__r))) - { } - */ - constexpr _Vp base() const& requires copy_constructible<_Vp> { return _M_base; } @@ -4115,14 +4103,14 @@ namespace views::__adaptor _Iterator() requires default_initializable> = default; constexpr explicit - _Iterator(iterator_t<_Base> current) - : _M_current(std::move(current)) + _Iterator(iterator_t<_Base> __current) + : _M_current(std::move(__current)) { } constexpr - _Iterator(_Iterator i) + _Iterator(_Iterator __i) requires _Const && convertible_to, iterator_t<_Base>> - : _M_current(std::move(i._M_current)) + : _M_current(std::move(__i._M_current)) { } constexpr const iterator_t<_Base>&