From: Jonathan Wakely Date: Thu, 16 Feb 2023 11:32:00 +0000 (+0000) Subject: libstdc++: Fix non-reserved names in X-Git-Tag: basepoints/gcc-14~1127 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b81b017ed30b8c6abb2e58a3ed9eb67eccc1c181;p=thirdparty%2Fgcc.git libstdc++: Fix non-reserved names in libstdc++-v3/ChangeLog: * include/ext/throw_allocator.h: Use reserved names for parameters. --- diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index 4c5565bcc2ea..0dbf00176dc1 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)