From 3ae0cd94abc15e33dc06ca7a5f76f14b1d74129f Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Wed, 26 Aug 2020 21:51:48 -0400 Subject: 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. --- libstdc++-v3/include/std/ranges | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libstdc++-v3/include/std') diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 4202835..2d0017f 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); } -- cgit v1.1