From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 2030E383F432; Wed, 5 May 2021 18:33:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2030E383F432 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-9802] libstdc++: Implement LWG 3517/3520 for join_view/transform_view X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: a3a6a7f0dcd3e0775c700b4a06320ac911a2c5b5 X-Git-Newrev: 0df3ba966080be77dd53bdbe3423ae7e24e37c96 Message-Id: <20210505183303.2030E383F432@sourceware.org> Date: Wed, 5 May 2021 18:33:03 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 18:33:03 -0000 https://gcc.gnu.org/g:0df3ba966080be77dd53bdbe3423ae7e24e37c96 commit r10-9802-g0df3ba966080be77dd53bdbe3423ae7e24e37c96 Author: Patrick Palka Date: Wed May 5 12:07:32 2021 -0400 libstdc++: Implement LWG 3517/3520 for join_view/transform_view libstdc++-v3/ChangeLog: * include/std/ranges (transform_view::_Iterator::iter_swap): Remove as per LWG 3520. (join_view::_Iterator::iter_swap): Add indirectly_swappable constraint as per LWG 3517. (cherry picked from commit 2663727d853438ee4d67b200a08f94a318745486) Diff: --- libstdc++-v3/include/std/ranges | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 822329c0800..caca68ac0c0 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1860,12 +1860,6 @@ namespace views return *__i; } - friend constexpr void - iter_swap(const _Iterator& __x, const _Iterator& __y) - noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current))) - requires indirectly_swappable<_Base_iter> - { return ranges::iter_swap(__x._M_current, __y._M_current); } - friend _Iterator; template friend struct _Sentinel; }; @@ -2658,6 +2652,7 @@ namespace views friend constexpr void iter_swap(const _Iterator& __x, const _Iterator& __y) noexcept(noexcept(ranges::iter_swap(__x._M_inner, __y._M_inner))) + requires indirectly_swappable<_Inner_iter> { return ranges::iter_swap(__x._M_inner, __y._M_inner); } friend _Iterator;