From: Patrick Palka <ppalka@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org, Patrick Palka <ppalka@redhat.com>
Subject: [PATCH 2/2] libstdc++: Implement LWG 3692/3702 changes to zip_/zip_transform_view
Date: Thu, 25 Aug 2022 11:39:38 -0400 [thread overview]
Message-ID: <20220825153938.2249619-2-ppalka@redhat.com> (raw)
In-Reply-To: <20220825153938.2249619-1-ppalka@redhat.com>
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<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
@@ -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
next prev parent reply other threads:[~2022-08-25 15:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 15:39 [PATCH 1/2] libstdc++: Implement ranges::zip_transform_view from P2321R2 Patrick Palka
2022-08-25 15:39 ` Patrick Palka [this message]
2022-08-26 19:58 ` [PATCH 2/2] libstdc++: Implement LWG 3692/3702 changes to zip_/zip_transform_view Jonathan Wakely
2022-08-26 19:58 ` [PATCH 1/2] libstdc++: Implement ranges::zip_transform_view from P2321R2 Jonathan Wakely
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=20220825153938.2249619-2-ppalka@redhat.com \
--to=ppalka@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@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).