From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 5FF76398602E; Thu, 3 Sep 2020 15:51:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FF76398602E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1599148287; bh=745f6xRq+Z4AAFaNe3S+qPdouFTcamqyqcMJs6QrszE=; h=From:To:Subject:Date:From; b=FPGkHITnLgOc3chOuNh9VxSnBZ8tU0aRtksLyf5+jjdF0NKGtdbbnAlnc6zYkXxP4 oTcv0sG0qehw7X1+tL5CpomhW2Oar09PPlRlGrZVu15GBqSE3i5qrmXX5uuY7qkCss xdxNRKjxt4z2Dci3Ai5pdVp6Yw0d5LkXni+VhqoI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testbase)] libstdc++: Implement remaining piece of LWG 3448 X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/users/aoliva/heads/testbase X-Git-Oldrev: 4be16d1c1cfa6d151d2853ce509c1a797189c9ad X-Git-Newrev: 3ae0cd94abc15e33dc06ca7a5f76f14b1d74129f Message-Id: <20200903155127.5FF76398602E@sourceware.org> Date: Thu, 3 Sep 2020 15:51:27 +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: Thu, 03 Sep 2020 15:51:27 -0000 https://gcc.gnu.org/g:3ae0cd94abc15e33dc06ca7a5f76f14b1d74129f commit 3ae0cd94abc15e33dc06ca7a5f76f14b1d74129f Author: Patrick Palka Date: Wed Aug 26 21:51:48 2020 -0400 libstdc++: Implement remaining piece of LWG 3448 Almost all of the proposed resolution for LWG 3448 is already implemented; the only part left is to adjust the return type of transform_view::sentinel::operator-. libstdc++-v3/ChangeLog: PR libstdc++/95322 * include/std/ranges (transform_view::sentinel::__distance_from): Give this a deduced return type. (transform_view::sentinel::operator-): Adjust the return type so that it's based on the constness of the iterator rather than that of the sentinel. * testsuite/std/ranges/adaptors/95322.cc: Refer to LWG 3488. Diff: --- libstdc++-v3/include/std/ranges | 18 +++++++++--------- libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 42028354b81..2d0017f1750 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1865,7 +1865,7 @@ namespace views using _Base = __detail::__maybe_const_t<_Const, _Vp>; template - constexpr range_difference_t<_Base> + constexpr auto __distance_from(const _Iterator<_Const2>& __i) const { return _M_end - __i._M_current; } @@ -1902,17 +1902,17 @@ namespace views operator==(const _Iterator<_Const2>& __x, const _Sentinel& __y) { return __y.__equal(__x); } - template - requires sized_sentinel_for, - iterator_t<__detail::__maybe_const_t<_Const2, _Vp>>> - friend constexpr range_difference_t<_Base> + template> + requires sized_sentinel_for, iterator_t<_Base2>> + friend constexpr range_difference_t<_Base2> operator-(const _Iterator<_Const2>& __x, const _Sentinel& __y) { return -__y.__distance_from(__x); } - template - requires sized_sentinel_for, - iterator_t<__detail::__maybe_const_t<_Const2, _Vp>>> - friend constexpr range_difference_t<_Base> + template> + requires sized_sentinel_for, iterator_t<_Base2>> + friend constexpr range_difference_t<_Base2> operator-(const _Sentinel& __y, const _Iterator<_Const2>& __x) { return __y.__distance_from(__x); } diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc index 9279d5520a8..67bc7d33917 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/95322.cc @@ -26,7 +26,7 @@ using __gnu_test::test_forward_range; void test01() { - // PR libstdc++/95322 + // PR libstdc++/95322 and LWG 3488 int a[2]{1, 2}; test_forward_range v{a}; auto view1 = v | std::views::take(2);