From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 62C523851AB9; Tue, 28 Mar 2023 23:34:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62C523851AB9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680046454; bh=9pGj84bmDJSOfqn//9Yp+tZHQEMIzgUAxvBBT6lmv2s=; h=From:To:Subject:Date:From; b=nnLkBfPV0fzuoq2NGyBHb9IG6PyninxIdUPXtPucqrUO1HnyCyxpQogIQLAsnsyLV T5/y0rIAhrgA2ls5OO1WPenAsX5+YSIT7hZrAZLB1QoGZ8ddtW1KrPaguzMdEsa10Q tcpdZSyaGmvVRB7rrf9MwyBvScxof0Y3omgSKbDY= 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 r12-9334] libstdc++: Fix non-reserved names in X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 274907c73647d2a1394523bd0e714aa920b51595 X-Git-Newrev: e1c8dc0ba5a012bd3bc0c527e4db40a885c8bc42 Message-Id: <20230328233414.62C523851AB9@sourceware.org> Date: Tue, 28 Mar 2023 23:34:14 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e1c8dc0ba5a012bd3bc0c527e4db40a885c8bc42 commit r12-9334-ge1c8dc0ba5a012bd3bc0c527e4db40a885c8bc42 Author: Jonathan Wakely Date: Thu Feb 16 11:32:00 2023 +0000 libstdc++: Fix non-reserved names in libstdc++-v3/ChangeLog: * include/ext/throw_allocator.h: Use reserved names for parameters. (cherry picked from commit b81b017ed30b8c6abb2e58a3ed9eb67eccc1c181) Diff: --- 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 220f5f5243f..10d214360bd 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -849,13 +849,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; } @@ -878,8 +878,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)