From patchwork Thu Aug 25 15:12:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 764 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:ecc5:0:0:0:0:0 with SMTP id s5csp287519wro; Thu, 25 Aug 2022 08:13:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR5gYf2Gigq+R452eqmh+SEyp8oaopR1wR/MDAwRuHdBSCCNQRIkkzGCfBDDKktESqpU4I9V X-Received: by 2002:a05:6402:138f:b0:43d:8ed5:c841 with SMTP id b15-20020a056402138f00b0043d8ed5c841mr3678454edv.27.1661440382581; Thu, 25 Aug 2022 08:13:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661440382; cv=none; d=google.com; s=arc-20160816; b=Ace34iuWSqH02n2e2DX55AIJAg0ktUKqqwkntD+uOYgPRHjkHpHCOTgo0yjFB3cw3j TdGovM+WJl6lVAbZOGYpTY+AyuUuL5fabTkC9PcSngdS4oA4SzhqDD5PdE5j1UCE6mQw g3WO3XcjXCfKgZnSwLpw03pJpCsZJd6LMiXAN2bQEu8+GlKP0siVun7nuvxdU77Yr3lb vgROT2u3Uqt5pQ1ChrIVKsdPETzNwHLmYBFOyHkTu8J/0hlDi4dW2cfLO0y0+F4JODWc pqyiZ0WkePlXkzFllWiqB02yBk7kUE6k9wb7NBF4fc8L9V6qh6k5sVsr+qkyIbLfowzM +TPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=SywaVwUN0ItRjrzolXo79ISAnHglik06iTMTjly44kA=; b=cXl1iGiNrMBBoKXrQgJjp0xZz2NR7leRkf4jxt5d5U/hUKouW7ldnYArfDgI0X6fmc /4+TNMw7V9+1WfCnaVknWBJodzpr1nkZPUs3o3P5UBmZWMTTJjKjvEIQthfti+RVxCr1 X+D2oUGN2uXQzeeP6pA0mwIMtA3zs/mSJuh+KR2/gjN4f+tJAMmus4WlOf2cV2M4wGcO H1GJlN3gUvsgWLZbmE9huE7k/F4l2JT8E0e6rS84xAOyVG69arrzK/EnMiByr+WijDQW IStT9YNRO8Xkkxbl7M17Rk8RlmP0Wygh8cgN5DJByc2lZk5PIHMwCnZ+C5rdJcZNSyoA yeuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=BhXEh6jY; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id g8-20020a1709065d0800b0073d78033578si4715001ejt.622.2022.08.25.08.13.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 08:13:02 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=BhXEh6jY; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 334673851AB4 for ; Thu, 25 Aug 2022 15:12:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 334673851AB4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661440373; bh=SywaVwUN0ItRjrzolXo79ISAnHglik06iTMTjly44kA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=BhXEh6jYFXOlpfFAp4Qy6mpG3rf0JeMUQZ3VFgKSsOJHIb9bx9rFn+FeEkvjEmv7f QH2/bg1KoMA+TFkMfs0gNg94fjS5fQbLsanB9XaSmN+vibS89JUUMInMCB4BD2HIXh CcOp2U/7n8jl5SOF9kYYvVRb8VSpTQRYXVnFYLr4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id A9518385841A for ; Thu, 25 Aug 2022 15:12:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A9518385841A Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-397-rJ2smw66OLGNxA5Z88mrrw-1; Thu, 25 Aug 2022 11:12:07 -0400 X-MC-Unique: rJ2smw66OLGNxA5Z88mrrw-1 Received: by mail-qt1-f199.google.com with SMTP id v13-20020a05622a188d00b00343794bd1daso15570411qtc.23 for ; Thu, 25 Aug 2022 08:12:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=SywaVwUN0ItRjrzolXo79ISAnHglik06iTMTjly44kA=; b=B+YXteIhJ9ZwXisGFHnWPWMMFpr6F1nODx9BhNgQUPgh/CzNlD2Rf7WgqSRYL8Q+Bz owx+PBZdeSWsi7eR+MARat8FVM0GirqLXgLwuWTt6Dot6A9BWyR8CGmSe8qoSPzOuIZt ZVm7EiL0IZ2ozqL2zIJ/TWQpXJ31Qsv/4llmfJ9vqEeZ6tHA0FfPEhxPkMMUbsHldcOw oMZpybsxZRPWBImFOHRzoScm2TxdbHU3dld9M0HFVu+eu8C/DcWddwEc60USVDRCYACr LJa0GVH4XPXGw2ymgh/MpNNfnI7lzzUmhEITg57NMmD8ah0tOqL0MVgSMcRY9z/rk0pV qVGg== X-Gm-Message-State: ACgBeo2qeoKsCJdUdMw4l1ZvJMyQAdvImkexDwlyn1aNsWwJpWqrnVx9 n9GUaTJHsdM2gTaR/um1k1/6ux8C953NpHBsE1DX7Xq+O60Mfad3923piXOckITvQzQB1VHab2m tm1tKXe7E/ynaHZjezdee664brClOgDnZX4th0e1we+lfiTkQ24VWmvF3RDkyqzVJXRs= X-Received: by 2002:a37:444f:0:b0:6bb:186e:345e with SMTP id r76-20020a37444f000000b006bb186e345emr3348134qka.105.1661440326312; Thu, 25 Aug 2022 08:12:06 -0700 (PDT) X-Received: by 2002:a37:444f:0:b0:6bb:186e:345e with SMTP id r76-20020a37444f000000b006bb186e345emr3348117qka.105.1661440326030; Thu, 25 Aug 2022 08:12:06 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id ga10-20020a05622a590a00b003430589dd34sm15164412qtb.57.2022.08.25.08.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 08:12:05 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Some minor cleanups Date: Thu, 25 Aug 2022 11:12:03 -0400 Message-Id: <20220825151203.2212873-1-ppalka@redhat.com> X-Mailer: git-send-email 2.37.2.382.g795ea8776b MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1742146510924181457?= X-GMAIL-MSGID: =?utf-8?q?1742146510924181457?= 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'. --- 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>&