From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 182243858421 for ; Mon, 6 Feb 2023 14:26:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 182243858421 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675693568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQPDwlBNJdzmPrOjGrAAihGn2c9IaNY8b1p7HHDix6I=; b=jWrrAzzWIc0kzfFMFDFhyXisY+BbyUj30Ny1LYSg3VcVCwFrsOevSyLE1Sxb5N9GZGjmQ2 xxUy0O6yM3eWqTT0c1F7VaN0V7skrS2xkIxo7SqiIZHQ5eV3z98vNcsWX1pAobZIj5sv3I EQ1MggFbcDXylGfuzx5/jxvpIsu96hA= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-zhf9Q_EBPNy_Q2sG5oaXcQ-1; Mon, 06 Feb 2023 09:26:07 -0500 X-MC-Unique: zhf9Q_EBPNy_Q2sG5oaXcQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6910B1C07542; Mon, 6 Feb 2023 14:26:07 +0000 (UTC) Received: from localhost (unknown [10.33.36.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FDC0492B21; Mon, 6 Feb 2023 14:26:07 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix non-reserved name for template parameter Date: Mon, 6 Feb 2023 14:26:06 +0000 Message-Id: <20230206142606.2970099-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested powerpc64le-linux. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * include/bits/ranges_algo.h (__find_last_fn): Rename T to _Tp. (__find_last_if_fn): Likewise. --- 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)); } }; -- 2.39.1