From patchwork Thu Feb 16 11:50:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 57998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp253481wrn; Thu, 16 Feb 2023 03:51:25 -0800 (PST) X-Google-Smtp-Source: AK7set/WMC2+Z7KCk2JQKoFn36zxnRDy28HEqh2uLDXReB+u3CR4JpyPSdInPolkZVThglIA+1i+ X-Received: by 2002:aa7:c40f:0:b0:4aa:a1d4:bbd4 with SMTP id j15-20020aa7c40f000000b004aaa1d4bbd4mr6056234edq.42.1676548285203; Thu, 16 Feb 2023 03:51:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676548285; cv=none; d=google.com; s=arc-20160816; b=WM6J4t9fo2ZF/LIO6ucSSqagGfKxnHmul5OJLQDGbbJNb8o456NDHp8m5vy8RETkXi 5hvT/gEkE1yoH5gKxVxiLzBHWWhrK5cXtOAJeVKSNWbS3gnT+kU30KYmL1PRBfpXhAOt 1GlOlzm9PQDOVSwiRdAK6jHyvmTZwX8tLBfTNLlGn7MCpvhzMDFfmrDVK1D31aXtOfHV EKaL/pajMhPqTyR+QgoTHPHT+GUpjUBwd+iGWqCa88cYuF8T2ERFFr6y2uxFnF79poIJ rgpGNutxjZZIn9KIZrGzAmWa0iV6ySLCxm/pjRRGLsqMhEkq4wxCHdQ2nL8ea0/bDsur 2uGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=CIupllURwnb/LA780sPlHjRFLjSmaYiGi6XKD+G6DPY=; b=Sso3px7/HyOysiiswevNyY5YoJzohtA+ahao3s5WmhDHIkBIMsF8ReV3XDwySMyVTT W3+4usV3jKaOvIQSK9iQTHSy3Z+E2mKb245Vp6JUi2mYTNZ9y71ilebghEAK4/QiTxz0 5pZDSIBXyAMeT08DTJ0YzKlHSIyM7aBaEtqzvcIkpjZBOy/ugjzlq+LMPq/BotOaDf6A dV3P+lLz8C+Trhwvo5of1LyDqwks1RND/AtMJIKR2qltIwCj0SBh6jW3mPeT0nHpcFSz 4UvdD7mD2gCYGg32yX8h84qLgNb58pQJ1bENA4CgAgb/qYLA6zEdNrljpfEnmN3wgAf+ 6asw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=CtJlfVYo; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id v11-20020a056402184b00b004ace655ef52si1886724edy.523.2023.02.16.03.51.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 03:51:25 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=CtJlfVYo; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7A5E6385828E for ; Thu, 16 Feb 2023 11:51:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A5E6385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676548270; bh=CIupllURwnb/LA780sPlHjRFLjSmaYiGi6XKD+G6DPY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CtJlfVYoCnAZzVH27ZU8FUU+qwkZvbGctzwVSWsIBKtCn+1WW5xn8H9M9gEiIvnXi CIBcyprUhDf4Yh/krN9hjE91Hqj+jV/vZvygte+tM81TCGQSBdOHCxvycJEUBL0G0N mP2TIVCPU72CrHDt5vERujGJrW69umB3msD4DMQk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D0039385480B for ; Thu, 16 Feb 2023 11:50:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0039385480B Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-ci7VQ_d1OTqi1MFuWd8O3Q-1; Thu, 16 Feb 2023 06:50:11 -0500 X-MC-Unique: ci7VQ_d1OTqi1MFuWd8O3Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E4CE13C16E96; Thu, 16 Feb 2023 11:50:10 +0000 (UTC) Received: from localhost (unknown [10.33.37.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE5354010E86; Thu, 16 Feb 2023 11:50:10 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix non-reserved names in Date: Thu, 16 Feb 2023 11:50:10 +0000 Message-Id: <20230216115010.108388-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757988294500414064?= X-GMAIL-MSGID: =?utf-8?q?1757988294500414064?= 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)