From patchwork Fri Jan 12 09:44:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 187700 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp99053dyc; Fri, 12 Jan 2024 03:09:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2fRsihRhMJIj02JZI3MKSVpT1pygustJBlzi9x/HSySBfvkt/r21geXvQ1A39AYX33sHH X-Received: by 2002:ac8:4e87:0:b0:429:a494:866e with SMTP id 7-20020ac84e87000000b00429a494866emr1499791qtp.18.1705057794566; Fri, 12 Jan 2024 03:09:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705057794; cv=pass; d=google.com; s=arc-20160816; b=vwjlF1x2OpsyENK3oLo8Et/0BakmFcGoIr7k98ymVRXSZAa13nYEGxWM5nXXtM5Mj5 jMCF2u4FWBmiQ9lMOATnzR5y+ku0E/qSzJbqfD/HhzWagjqopLZy+DlduvDodJtJs3U8 ZZdGDkjlTJjflnLglDqpnaZDmrAVh76p9aM5y1kXjEbGRYwTcPr0xyKo2I8VJotVFunn m9mFNuJBaUxlnnz6N9Q+uKu/auUgneJ9oCIW7XHS/dWjESJ4znAP/M7UYrL82mcMgAd4 NYSJl9rbGGfQSLaqZabZcNP90nSAx0e7s0As/Io8aScsJqKdMElFVxfKYefQ2etWjQMa rbxg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=TKFNl242EO60zyve1JYapdqDgkDV4QO5Ywhn9Lq6ByE=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=Yb1rZdRR4/tx/nJVx3ThBjqvN91bW3X1LVOOMiPrE9fL1ieILyUGTN+aMu664wfXep XKdxh2eqG4oPCUejPRiC2kKA9JaARosYi51jmFXoV8PVzGkonjCJd+sZp4UGzjpGcQ36 IDOtqjBzQU2Kc7findcQlcY5BW97CLeLJiEH1NTOTq6HlX8+LMra0PlZ5d3PaCVxMvp1 pZFqpSOGf3ppF84DoT3IaM7SXVKdt2hzHZeC4EJbJdBhrzD9RqRXUrXPG1bCSZx3Cegb FOUYWma/1BIoZYTul98SrEkVDlPkIUWpT9H7BJtretiTEwVa0HsJHUEXV3unVSP+2+Vb EopQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gIpG4QZA; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id e18-20020ac85dd2000000b00428340b0ae5si2714475qtx.731.2024.01.12.03.09.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 03:09:54 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gIpG4QZA; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4DF93857713 for ; Fri, 12 Jan 2024 09:46:15 +0000 (GMT) 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 1A7EE3858D1E for ; Fri, 12 Jan 2024 09:45:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A7EE3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1A7EE3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705052712; cv=none; b=I6ZoVzye4iAw74aLxIaUB8nuTNadU7bheLdhA6uEy5I1kI72drCCQxRK6johGWdMXk0ZSkw8nbZFHHLFumI2VkhxvuGEb+cW1sHuOXEEocOoJUX+bSjh3xUW62dJoVO2G3HgoiIjgTNDj5EOgs/pEPQ6vyOeQdQ3POzZROVXFA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705052712; c=relaxed/simple; bh=SImJ/2094fJMIF7ir1XQSSh4gINi9LfXx8XUEaXecsU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=e5TqyKJbjwUyB+Y84VMFMURjPZccqoX5a1Z5fapQ8buM3yGsoiqCjQAL3HiuWusbHp7UrKBklFjHF03/Kj5QUI2mZkynCvP8wMsqNyWW6ryuVRhTZsSoGQdtS4oibryYdf5WTnPseGKfyQcYDdZeLhVaD201R186YAj3YS9dYg4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705052709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TKFNl242EO60zyve1JYapdqDgkDV4QO5Ywhn9Lq6ByE=; b=gIpG4QZAB0xIgIaU4fZIEwQDLUBxBwmIEOYSU9AlrUUSuGT55Kzx/nqyZ70BwhXz2+h4OF whoHrXv4utY6xeOjFtYfmvLIjtmrnQrlvb6mq1BbdloUUYAD66C0nKM339SrCo3aAeJ/yb 9Z/cgPHof05ctZw+j5c3HK+N2zshXBM= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-375--LVT68_xOrCFBStXWpcXtg-1; Fri, 12 Jan 2024 04:45:08 -0500 X-MC-Unique: -LVT68_xOrCFBStXWpcXtg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CEC4738143BD; Fri, 12 Jan 2024 09:45:07 +0000 (UTC) Received: from localhost (unknown [10.42.28.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9927E492BF0; Fri, 12 Jan 2024 09:45:07 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix incorrect PR number in comment Date: Fri, 12 Jan 2024 09:44:52 +0000 Message-ID: <20240112094507.683543-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.1 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787882681738710805 X-GMAIL-MSGID: 1787882681738710805 Tested x86_64-linux, pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * include/std/format (__format::_Arg_store): Fix PR number in comment. Simplify preprocessor code. --- libstdc++-v3/include/std/format | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index b3b5a0bbdbc..7440a25ea97 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -3652,12 +3652,9 @@ namespace __format friend std::basic_format_args<_Context>; template - friend auto + friend auto std:: #if _GLIBCXX_INLINE_VERSION - // Needed for PR c++/59526 - std::__8:: -#else - std:: + __8:: // Needed for PR c++/59256 #endif make_format_args(_Argz&...) noexcept;