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 C985438515F3 for ; Thu, 25 Aug 2022 15:40:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C985438515F3 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=1661442006; 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: in-reply-to:in-reply-to:references:references; bh=zRMjThG9807+WKyva0WSMVl57g7gmrZNyZ0JE2yJTxs=; b=iLVfb3qXQZcUuM00VT2ydZJtZ7KMUrSJEENCihtBadSGuXSqa/RF1yW4e+UgEd1wMQICdH MftyvG9Vo8zq4Qb8W4cP/1XMkbLQZvUzfYm1NBSt2LDlToDDrAuTYDoBeWMyYdD/RG8puj W1pmVDljodkli+In+1Lz0Df+twyLIl4= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-346-mP1X8OIwPG6VVjJ8mABttA-1; Thu, 25 Aug 2022 11:40:05 -0400 X-MC-Unique: mP1X8OIwPG6VVjJ8mABttA-1 Received: by mail-qk1-f199.google.com with SMTP id l15-20020a05620a28cf00b006b46997c070so17777727qkp.20 for ; Thu, 25 Aug 2022 08:40:05 -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:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zRMjThG9807+WKyva0WSMVl57g7gmrZNyZ0JE2yJTxs=; b=p48C7GKP6Ji3h8IsBtDDwdML9ay1KnWQqiiGfzEyaNxexIhqNBNIW6ol6PBO0a6oio K9Yp4qocUXQntsFzpiCPzecoMS444X7k/2iK4D+9jUmGY1tO8AYUmgpKhe5aDkCwOzgs /ncE9kW6HrzUHdsZSSqeQB3Z+ISsP2olI+kMhxOu7Aj3y4wG82mWmnDKCyuPq8AdZ7Iv b+N+kLWQxPucgGJHNBJKPwUfL8I79nGWSgnBgOuHDtQXwYifrJ0IDeUZ/YxntVFdgYA5 jUTcp281vXtQ85VHWnWUvUHu2JVq1fKtB5mEkVTDUADJgIyq0GAAb0L/+gCxgy8BzkaG 3Yjg== X-Gm-Message-State: ACgBeo3yIRZZBNqCHJ2ssOLwLGshzHcWJvg8tBkmqmZ/PszxzA7s7s8y o4+UNimlx1KyEUjEX3lnHrdrfz5gxSzRTCux6Xlv7OVmoQbh2SMhR49uvJpbzLSr2ttMTiT2l3x yAfgJzfqcmvTcC4BNn38aToEGq8EPPI6KO7P8EvNznoOtRNOFg8UA9UDPmif6CHMmhAQ= X-Received: by 2002:a05:620a:450e:b0:6bb:a4cf:de01 with SMTP id t14-20020a05620a450e00b006bba4cfde01mr3532931qkp.636.1661442004631; Thu, 25 Aug 2022 08:40:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR4gcyqGqcJ7vxGJK5NHve207llrHsavSBuu0QKrxwWDyZrzbH1g4f2xkFjrAW5sI/bkvGL7nA== X-Received: by 2002:a05:620a:450e:b0:6bb:a4cf:de01 with SMTP id t14-20020a05620a450e00b006bba4cfde01mr3532920qkp.636.1661442004356; Thu, 25 Aug 2022 08:40:04 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id j27-20020a05620a147b00b006ba9b2167a2sm16033677qkl.16.2022.08.25.08.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 08:40:04 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH 2/2] libstdc++: Implement LWG 3692/3702 changes to zip_/zip_transform_view Date: Thu, 25 Aug 2022 11:39:38 -0400 Message-Id: <20220825153938.2249619-2-ppalka@redhat.com> X-Mailer: git-send-email 2.37.2.382.g795ea8776b In-Reply-To: <20220825153938.2249619-1-ppalka@redhat.com> References: <20220825153938.2249619-1-ppalka@redhat.com> 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: Tested on x86_64-pc-linux-gnu, does this look OK for trunk? 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