From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 57742385800F; Wed, 31 Aug 2022 20:47:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57742385800F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661978822; bh=KlTGpN56VhedtdFGRsVRC2ZuAW5hB3dDqWGjbQUdoEY=; h=From:To:Subject:Date:From; b=oOqo0Hw1HeQogWad1A6brPc3DeC1/JlvizNhfqwXytMiW4MxNVVpVoJQGsCQVO8Yv XZvYeTO3YoJGFAux1bfBHS0sqfjXJyfEncsDqEKHOihrLCNBmR/PilhUjTt7tQcUKF n/y/vic1qxVH4yG2zgdIkDZTLDpLhuJWp+A35FvY= 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 r13-2323] libstdc++: A few more minor cleanups X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: ad8428c17ae4167f74584fb455d964a0f73a057a X-Git-Newrev: 26aafae4e50d1b90fe3a265027003487c1d25b45 Message-Id: <20220831204702.57742385800F@sourceware.org> Date: Wed, 31 Aug 2022 20:47:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:26aafae4e50d1b90fe3a265027003487c1d25b45 commit r13-2323-g26aafae4e50d1b90fe3a265027003487c1d25b45 Author: Patrick Palka Date: Wed Aug 31 16:45:30 2022 -0400 libstdc++: A few more minor cleanups libstdc++-v3/ChangeLog: * include/bits/ranges_base.h (__advance_fn::operator()): Add parentheses in assert condition to avoid -Wparentheses warning. * include/std/ranges: (take_view::take_view): Uglify 'base'. (take_while_view::take_while_view): Likewise. (elements_view::elements_view): Likewise. (views::_Zip::operator()): Adjust position of [[nodiscard]] for compatibility with -fconcepts-ts. (zip_transform_view::_Sentinel): Uglify 'OtherConst'. (views::_ZipTransform::operator()): Adjust position of [[nodiscard]] for compatibilty with -fconcepts-ts. Diff: --- libstdc++-v3/include/bits/ranges_base.h | 2 +- libstdc++-v3/include/std/ranges | 40 ++++++++++++++++----------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h index 38db33fd2ce..866d7c56cbc 100644 --- a/libstdc++-v3/include/bits/ranges_base.h +++ b/libstdc++-v3/include/bits/ranges_base.h @@ -778,7 +778,7 @@ namespace ranges else if (__n != 0) [[likely]] { // n and bound must not lead in opposite directions: - __glibcxx_assert(__n < 0 == __diff < 0); + __glibcxx_assert((__n < 0) == (__diff < 0)); (*this)(__it, __n); return 0; diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 2352aad76fc..39822b71b94 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2121,8 +2121,8 @@ namespace views::__adaptor take_view() requires default_initializable<_Vp> = default; constexpr - take_view(_Vp base, range_difference_t<_Vp> __count) - : _M_base(std::move(base)), _M_count(std::move(__count)) + take_view(_Vp __base, range_difference_t<_Vp> __count) + : _M_base(std::move(__base)), _M_count(std::move(__count)) { } constexpr _Vp @@ -2355,8 +2355,8 @@ namespace views::__adaptor = default; constexpr - take_while_view(_Vp base, _Pred __pred) - : _M_base(std::move(base)), _M_pred(std::move(__pred)) + take_while_view(_Vp __base, _Pred __pred) + : _M_base(std::move(__base)), _M_pred(std::move(__pred)) { } constexpr _Vp @@ -3982,8 +3982,8 @@ namespace views::__adaptor elements_view() requires default_initializable<_Vp> = default; constexpr explicit - elements_view(_Vp base) - : _M_base(std::move(base)) + elements_view(_Vp __base) + : _M_base(std::move(__base)) { } constexpr _Vp @@ -4753,9 +4753,8 @@ namespace views::__adaptor { template requires (sizeof...(_Ts) == 0 || __detail::__can_zip_view<_Ts...>) - [[nodiscard]] constexpr auto - operator()(_Ts&&... __ts) const + operator() [[nodiscard]] (_Ts&&... __ts) const { if constexpr (sizeof...(_Ts) == 0) return views::empty>; @@ -5036,22 +5035,22 @@ namespace views::__adaptor : _M_inner(std::move(__i._M_inner)) { } - template - requires sentinel_for<__zentinel<_Const>, __ziperator> + template + requires sentinel_for<__zentinel<_Const>, __ziperator<_OtherConst>> friend constexpr bool - operator==(const _Iterator& __x, const _Sentinel& __y) + operator==(const _Iterator<_OtherConst>& __x, const _Sentinel& __y) { return __x._M_inner == __y._M_inner; } - template - requires sized_sentinel_for<__zentinel<_Const>, __ziperator> - friend constexpr range_difference_t<__detail::__maybe_const_t> - operator-(const _Iterator& __x, const _Sentinel& __y) + template + requires sized_sentinel_for<__zentinel<_Const>, __ziperator<_OtherConst>> + friend constexpr range_difference_t<__detail::__maybe_const_t<_OtherConst, _InnerView>> + operator-(const _Iterator<_OtherConst>& __x, const _Sentinel& __y) { return __x._M_inner - __y._M_inner; } - template - requires sized_sentinel_for<__zentinel<_Const>, __ziperator> - friend constexpr range_difference_t<__detail::__maybe_const_t> - operator-(const _Sentinel& __x, const _Iterator& __y) + template + requires sized_sentinel_for<__zentinel<_Const>, __ziperator<_OtherConst>> + friend constexpr range_difference_t<__detail::__maybe_const_t<_OtherConst, _InnerView>> + operator-(const _Sentinel& __x, const _Iterator<_OtherConst>& __y) { return __x._M_inner - __y._M_inner; } }; @@ -5068,9 +5067,8 @@ namespace views::__adaptor { template requires (sizeof...(_Ts) == 0) || __detail::__can_zip_transform_view<_Fp, _Ts...> - [[nodiscard]] constexpr auto - operator()(_Fp&& __f, _Ts&&... __ts) const + operator() [[nodiscard]] (_Fp&& __f, _Ts&&... __ts) const { if constexpr (sizeof...(_Ts) == 0) return views::empty>>;