From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 0CB383861015; Thu, 16 Feb 2023 11:49:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CB383861015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676548196; bh=y0KnPUoxIhV5/lz0kTh/x/iDRhH6JXDUCdPBvJQyrwY=; h=From:To:Subject:Date:From; b=d4Jx+qGJAR6e2Vju3Q7mA7bXZnck7ItUm/a+/wkVFuESiwqWw1d2gv1XRvoF+DxdA SX28BfOFLFAeOXAoIxWZG9pC2L3LnORJSuY6qWA+K17UbpD0JPNq6E12Se1VarpHKX ot0SaP8JQMKxK7nrYk+7wcvqFOPw4Qq2ANofUea0= 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-6080] libstdc++: Fix non-reserved names in X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 38a8a3341873d5068474ce2c73208eec9cd894d4 X-Git-Newrev: b81b017ed30b8c6abb2e58a3ed9eb67eccc1c181 Message-Id: <20230216114956.0CB383861015@sourceware.org> Date: Thu, 16 Feb 2023 11:49:56 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b81b017ed30b8c6abb2e58a3ed9eb67eccc1c181 commit r13-6080-gb81b017ed30b8c6abb2e58a3ed9eb67eccc1c181 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. 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 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)