]> gcc.gnu.org Git - gcc.git/commitdiff
libstdc++: Fix non-reserved names in <ext/throw_allocator.h>
authorJonathan Wakely <jwakely@redhat.com>
Thu, 16 Feb 2023 11:32:00 +0000 (11:32 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Tue, 28 Mar 2023 22:05:03 +0000 (23:05 +0100)
libstdc++-v3/ChangeLog:

* include/ext/throw_allocator.h: Use reserved names for
parameters.

(cherry picked from commit b81b017ed30b8c6abb2e58a3ed9eb67eccc1c181)

libstdc++-v3/include/ext/throw_allocator.h

index 220f5f5243f913081843dbc4fbed4ddcb95198d1..10d214360bd48bd7eef529e81a1165aa234afad6 100644 (file)
@@ -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)
This page took 0.063716 seconds and 5 git commands to generate.