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 590D6385022D for ; Fri, 26 Aug 2022 19:59:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 590D6385022D 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=1661543941; 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: in-reply-to:in-reply-to:references:references; bh=hsCyqj82FE1gPKVH3/y+8jM8q6Xraq8pooa5Z0oAe8M=; b=Iaplogi+870cpsouUgH7h3dP287mC0Rvw3tSlE6vSVSfmtBIAtssYY3OD3LyFypwtYrDMA Dw0Zq1so60S9XyFCbV5xyhQBbi/O3hjSJD5o3Z9y95KdvCbvpRs6zGcKnGcM06aZoUyXMk /ZnPAdHcqv+/9eVYobZJay5v2VwTr7s= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-632-_ECrJZO8O6KzQtVusku38g-1; Fri, 26 Aug 2022 15:58:59 -0400 X-MC-Unique: _ECrJZO8O6KzQtVusku38g-1 Received: by mail-qk1-f197.google.com with SMTP id bl16-20020a05620a1a9000b006bc3aa1908dso2032786qkb.15 for ; Fri, 26 Aug 2022 12:58:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=hsCyqj82FE1gPKVH3/y+8jM8q6Xraq8pooa5Z0oAe8M=; b=qFzGGTRVdRWzMlhOy0yBu/FFH/mf5ZipqoP5wdegUKpN3pRjYgk8re2O0Fo3S5RPkG uKk5uoCc4XlzVZHQSbNxfk7Mrr0t0DFBhU411+xkGg0zPtsmFrHIFKyQNoBdvoBZNfCn Q/kGrhKPu+vcMZ8FCvXOJp5kbfwdDANMagMhsVIIxMccFZp3H3agS+YnvKLmQEpj8W3U mMtV5qNds606nRQhdRsMIaO0P30oFG1qDdZTNqiBcxqpwtdlGUOo7bsx174aHo7K+r2+ eBAZz6pu4O/f79MkEtr0ZnkZ8v73wlnzA1iiM4qVAN90IffWBx0moW/AA7CVA0KIwE0T nUMw== X-Gm-Message-State: ACgBeo02ZrPDLIwmf0KkN4JDSDWkpmI7m9aZYDOVxkYsC1FmPcbTaVkr Uobl165HVA/4MZCq0A4QkGMCjdBjW+2b6RImdIvbLGeNjKSM6ajpx+8alUL8prP0jXSpWtz28mA PIjtgYGQLW1EK9D+ke0FOKqhuyYUa3Jg= X-Received: by 2002:a05:6214:f0e:b0:496:e627:2d26 with SMTP id gw14-20020a0562140f0e00b00496e6272d26mr1085554qvb.42.1661543939504; Fri, 26 Aug 2022 12:58:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR5bran6aCg85hCVjcAUo5Q5UuG17v5tbeq2OQVSMcnNMWA8UIEte/tRPYVjliHubS278aZzEDerd1kSFNqLnTw= X-Received: by 2002:a05:6214:f0e:b0:496:e627:2d26 with SMTP id gw14-20020a0562140f0e00b00496e6272d26mr1085544qvb.42.1661543939253; Fri, 26 Aug 2022 12:58:59 -0700 (PDT) MIME-Version: 1.0 References: <20220825153938.2249619-1-ppalka@redhat.com> <20220825153938.2249619-2-ppalka@redhat.com> In-Reply-To: <20220825153938.2249619-2-ppalka@redhat.com> From: Jonathan Wakely Date: Fri, 26 Aug 2022 20:58:48 +0100 Message-ID: Subject: Re: [PATCH 2/2] libstdc++: Implement LWG 3692/3702 changes to zip_/zip_transform_view To: Patrick Palka Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-12.6 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: On Thu, 25 Aug 2022 at 16:40, Patrick Palka via Libstdc++ wrote: > > Tested on x86_64-pc-linux-gnu, does this look OK for trunk? OK, thanks. > > libstdc++-v3/ChangeLog: > > * include/std/ranges (zip_view::_Iterator::operator<): Remove. > (zip_view::_Iterator::operator>): Remove. > (zip_view::_Iterator::operator<=): Remove. > (zip_view::_Iterator::operator>=): Remove. > (zip_view::_Iterator::operator<=>): Remove three_way_comparable > constraint. > (zip_transform_view::_Iterator): Ditto. > --- > libstdc++-v3/include/std/ranges | 43 +-------------------------------- > 1 file changed, 1 insertion(+), 42 deletions(-) > > diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges > index d748cb73346..bf0ff29c38c 100644 > --- a/libstdc++-v3/include/std/ranges > +++ b/libstdc++-v3/include/std/ranges > @@ -4616,30 +4616,9 @@ namespace views::__adaptor > }(make_index_sequence{}); > } > > - friend constexpr bool > - operator<(const _Iterator& __x, const _Iterator& __y) > - requires __detail::__all_random_access<_Const, _Vs...> > - { return __x._M_current < __y._M_current; } > - > - friend constexpr bool > - operator>(const _Iterator& __x, const _Iterator& __y) > - requires __detail::__all_random_access<_Const, _Vs...> > - { return __y < __x; } > - > - friend constexpr bool > - operator<=(const _Iterator& __x, const _Iterator& __y) > - requires __detail::__all_random_access<_Const, _Vs...> > - { return !(__y < __x); } > - > - friend constexpr bool > - operator>=(const _Iterator& __x, const _Iterator& __y) > - requires __detail::__all_random_access<_Const, _Vs...> > - { return !(__x < __y); } > - > friend constexpr auto > operator<=>(const _Iterator& __x, const _Iterator& __y) > requires __detail::__all_random_access<_Const, _Vs...> > - && (three_way_comparable>> && ...) > { return __x._M_current <=> __y._M_current; } > > friend constexpr _Iterator > @@ -5008,29 +4987,9 @@ namespace views::__adaptor > requires equality_comparable<__ziperator<_Const>> > { return __x._M_inner == __y._M_inner; } > > - friend constexpr bool > - operator<(const _Iterator& __x, const _Iterator& __y) > - requires random_access_range<_Base<_Const>> > - { return __x._M_inner < __y._M_inner; } > - > - friend constexpr bool > - operator>(const _Iterator& __x, const _Iterator& __y) > - requires random_access_range<_Base<_Const>> > - { return __x._M_inner > __y._M_inner; } > - > - friend constexpr bool > - operator<=(const _Iterator& __x, const _Iterator& __y) > - requires random_access_range<_Base<_Const>> > - { return __x._M_inner <= __y._M_inner; } > - > - friend constexpr bool > - operator>=(const _Iterator& __x, const _Iterator& __y) > - requires random_access_range<_Base<_Const>> > - { return __x._M_inner >= __y._M_inner; } > - > friend constexpr auto > operator<=>(const _Iterator& __x, const _Iterator& __y) > - requires random_access_range<_Base<_Const>> && three_way_comparable<__ziperator<_Const>> > + requires random_access_range<_Base<_Const>> > { return __x._M_inner <=> __y._M_inner; } > > friend constexpr _Iterator > -- > 2.37.2.382.g795ea8776b >