public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Fix non-reserved names in <ext/throw_allocator.h>
Date: Thu, 16 Feb 2023 11:50:10 +0000	[thread overview]
Message-ID: <20230216115010.108388-1-jwakely@redhat.com> (raw)

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 --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)
-- 
2.39.1


                 reply	other threads:[~2023-02-16 11:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230216115010.108388-1-jwakely@redhat.com \
    --to=jwakely@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).