public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Patrick Palka <ppalka@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-2232] libstdc++: Implement LWG 3692/3702 changes to zip_/zip_transform_view
Date: Fri, 26 Aug 2022 23:00:59 +0000 (GMT)	[thread overview]
Message-ID: <20220826230059.3108038376A6@sourceware.org> (raw)

https://gcc.gnu.org/g:d0fd62d0ff4d1e0648e11b650b4f449772663990

commit r13-2232-gd0fd62d0ff4d1e0648e11b650b4f449772663990
Author: Patrick Palka <ppalka@redhat.com>
Date:   Fri Aug 26 18:59:36 2022 -0400

    libstdc++: Implement LWG 3692/3702 changes to zip_/zip_transform_view
    
    libstdc++-v3/ChangeLog:
    
            * include/std/ranges (zip_view::_Iterator::operator<): Remove
            as per LWG 3692.
            (zip_view::_Iterator::operator>): Likewise.
            (zip_view::_Iterator::operator<=): Likewise.
            (zip_view::_Iterator::operator>=): Likewise.
            (zip_view::_Iterator::operator<=>): Remove three_way_comparable
            constraint as per LWG 3692.
            (zip_transform_view::_Iterator): Ditto as per LWG 3702.

Diff:
---
 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 d4e326ad9c6..6e2e561ed12 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -4616,30 +4616,9 @@ namespace views::__adaptor
 	}(make_index_sequence<sizeof...(_Vs)>{});
     }
 
-    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<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>> && ...)
     { return __x._M_current <=> __y._M_current; }
 
     friend constexpr _Iterator
@@ -5006,29 +4985,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

                 reply	other threads:[~2022-08-26 23:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220826230059.3108038376A6@sourceware.org \
    --to=ppalka@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).