[gcc r12-9334] libstdc++: Fix non-reserved names in <ext/throw_allocator.h>

Jonathan Wakely redi@gcc.gnu.org
Tue Mar 28 23:34:14 GMT 2023


https://gcc.gnu.org/g:e1c8dc0ba5a012bd3bc0c527e4db40a885c8bc42

commit r12-9334-ge1c8dc0ba5a012bd3bc0c527e4db40a885c8bc42
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Feb 16 11:32:00 2023 +0000

    libstdc++: Fix non-reserved names in <ext/throw_allocator.h>
    
    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)


More information about the Libstdc++-cvs mailing list