diff mbox series

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

Message ID 20230216115010.108388-1-jwakely@redhat.com
State Repeat Merge
Headers
Series [committed] libstdc++: Fix non-reserved names in <ext/throw_allocator.h> |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jonathan Wakely Feb. 16, 2023, 11:50 a.m. UTC 
  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 mbox series

Patch

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)