From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 423953858C2F for ; Thu, 25 Aug 2022 15:12:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 423953858C2F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661440328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SywaVwUN0ItRjrzolXo79ISAnHglik06iTMTjly44kA=; b=HPheVmdwy7JBEBWbd1XQYICAKOrLd71znLpR/6y2DTadOAl+aCWweuZyDxjT64kUEggcTx F6uDm0ylwgpufRvxyBlnxfbkrfdyT0lKLdjJiJIVjVEHsXtM841pvQlCWovZNrGZtisOTV Ej5PCN6n+zenxd8ptB7qoO/xRWi3Pw4= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-582-qOyLOO0pMF6nnqDPzVd4Wg-1; Thu, 25 Aug 2022 11:12:06 -0400 X-MC-Unique: qOyLOO0pMF6nnqDPzVd4Wg-1 Received: by mail-qt1-f200.google.com with SMTP id d20-20020a05622a05d400b00344997f0537so14261990qtb.0 for ; Thu, 25 Aug 2022 08:12:06 -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=Xs3zQxxpKM8TM4zMZsyaXFE1uBm/6xdP8C5sKeAE42nmsMOH4yWYsorTjgOFJNDQjj 17hxiU4DYcHWstStWxHpGz+If8k5xRIlTYjA4S9AX0UtqVbGKFWToNbTQuNzeLvomqSk YTQ0qCQ9crjHJ7cOH9neEO1P6TROcPcOi4cj+KAypMPfJ7E0GAiyQZoZx6eivm2AoYMm 2cNiM5sxh7lSzsztk4kpwngJ0FCrOohQxAEYCEovotzz8ywzFijLfumkuF+QXuLG9d7w ZIkYAHiVpaVWvMrHobwXlXovklXpID/8LglVBoGc8v7jP+np3R+5YuViIIVh6DduSTXs 8HKA== X-Gm-Message-State: ACgBeo2KNfBD0U2SVx3bDmZ5EaNTyaBjQGRa7u9C6Tk+Qwpb3/MJ0ZSO Lv+U41nhnUbMqYb/OHviL7dcD1jW7A1d9zAR9pkuBlURJeSj9MviShyPFHCqXq2hxeEVC69GGWo 6ovST6k2Nnhbbdag= X-Received: by 2002:a37:444f:0:b0:6bb:186e:345e with SMTP id r76-20020a37444f000000b006bb186e345emr3348131qka.105.1661440326281; Thu, 25 Aug 2022 08:12:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR7BlxIOwPrRxN5+w959TImzZDLI9FVKCjpnWVTSEkmVWkhthaCXr/9uXKFddCCcIi/fzPMvsw== 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) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.9 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_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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>& -- 2.37.2.382.g795ea8776b