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 D0039385480B for ; Thu, 16 Feb 2023 11:50:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0039385480B 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=1676548214; 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=CIupllURwnb/LA780sPlHjRFLjSmaYiGi6XKD+G6DPY=; b=Q0p5wDXUnNsLGzCJBbVWemXyV7E1E0Pjdz0ow7phXmDKEB0DOcqPXB7YZbJZ3iH1euqN6H P5BEw4nCvsR1B7Wkvim9J9dZTlLD0PCA+Xon22f1VJ7fI73OcEah4O52H8jhTXmlBFVdfM xaR/sEMQSR28dQdpKzZi2S7zsx9acFU= 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-652-ci7VQ_d1OTqi1MFuWd8O3Q-1; Thu, 16 Feb 2023 06:50:11 -0500 X-MC-Unique: ci7VQ_d1OTqi1MFuWd8O3Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E4CE13C16E96; Thu, 16 Feb 2023 11:50:10 +0000 (UTC) Received: from localhost (unknown [10.33.37.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE5354010E86; Thu, 16 Feb 2023 11:50:10 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix non-reserved names in Date: Thu, 16 Feb 2023 11:50:10 +0000 Message-Id: <20230216115010.108388-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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/ext/throw_allocator.h: Use reserved names for parameters. --- libstdc++-v3/include/ext/throw_allocator.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index 4c5565bcc2e..0dbf00176dc 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -851,13 +851,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return std::__addressof(__x); } _GLIBCXX_NODISCARD pointer - allocate(size_type __n, const void* hint = 0) + allocate(size_type __n, const void* __hint = 0) { if (__n > this->max_size()) std::__throw_bad_alloc(); throw_conditionally(); - pointer const a = traits::allocate(_M_allocator, __n, hint); + pointer const a = traits::allocate(_M_allocator, __n, __hint); insert(a, sizeof(value_type) * __n); return a; } @@ -880,8 +880,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #else void - construct(pointer __p, const value_type& val) - { return _M_allocator.construct(__p, val); } + construct(pointer __p, const value_type& __val) + { return _M_allocator.construct(__p, __val); } void destroy(pointer __p) -- 2.39.1