From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 02D8238432D6; Mon, 6 Feb 2023 14:25:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02D8238432D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675693543; bh=xRdytEA3DU74YPIgGZlIj6BaEh4Yn1W1MTT8iPYgJkI=; h=From:To:Subject:Date:From; b=RpQwvu1dokSCX+YkRKr/flxVe5rd14qX+4NSWakbkJGIUi7FcTMJSYoqQLFOLEs9o h+ErFBSNLOoLT7IxA3qg6MGYPV/67g5YJMJ+mWLEA7meTf9g6K7iSd43J59oEU3jzs MbJ1I3glBcz8qXSGB0vUuQ1FiBupZbsICPdQUnD4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5717] libstdc++: Fix non-reserved name for template parameter X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: c76f55bf330e7cb823cb850aa2694b355038625f X-Git-Newrev: 0afcb713217628de46a6e912eea286ed612ebcbc Message-Id: <20230206142543.02D8238432D6@sourceware.org> Date: Mon, 6 Feb 2023 14:25:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0afcb713217628de46a6e912eea286ed612ebcbc commit r13-5717-g0afcb713217628de46a6e912eea286ed612ebcbc Author: Jonathan Wakely Date: Mon Feb 6 12:16:05 2023 +0000 libstdc++: Fix non-reserved name for template parameter libstdc++-v3/ChangeLog: * include/bits/ranges_algo.h (__find_last_fn): Rename T to _Tp. (__find_last_if_fn): Likewise. Diff: --- libstdc++-v3/include/bits/ranges_algo.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h index 5577d862cb5..1685e1d85bb 100644 --- a/libstdc++-v3/include/bits/ranges_algo.h +++ b/libstdc++-v3/include/bits/ranges_algo.h @@ -3568,10 +3568,10 @@ namespace ranges struct __find_last_fn { - template _Sent, typename T, typename _Proj = identity> - requires indirect_binary_predicate, const T*> + template _Sent, typename _Tp, typename _Proj = identity> + requires indirect_binary_predicate, const _Tp*> constexpr subrange<_Iter> - operator()(_Iter __first, _Sent __last, const T& __value, _Proj __proj = {}) const + operator()(_Iter __first, _Sent __last, const _Tp& __value, _Proj __proj = {}) const { if constexpr (same_as<_Iter, _Sent> && bidirectional_iterator<_Iter>) { @@ -3599,10 +3599,10 @@ namespace ranges } } - template - requires indirect_binary_predicate, _Proj>, const T*> + template + requires indirect_binary_predicate, _Proj>, const _Tp*> constexpr borrowed_subrange_t<_Range> - operator()(_Range&& __r, const T& __value, _Proj __proj = {}) const + operator()(_Range&& __r, const _Tp& __value, _Proj __proj = {}) const { return (*this)(ranges::begin(__r), ranges::end(__r), __value, std::move(__proj)); } };