From patchwork Thu Feb 1 15:29:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1893997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FjGONhcq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQjby38R4z1yQ0 for ; Fri, 2 Feb 2024 02:33:34 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C59F386181F for ; Thu, 1 Feb 2024 15:33:32 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id 657ED3857809 for ; Thu, 1 Feb 2024 15:30:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 657ED3857809 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 657ED3857809 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706801431; cv=none; b=if7Ldgnkd+WOwIKTkTsVmz0EMx8wsZ6fCvEtvndQV+hIOFHI2jOlNt3oO+tRL0+t2BHjmIGOS1PO53/e3o4D1DjMhyYYZRBOesQmlht8ghqx+Ilh5rIrxnZkHWJL/pOtoFjtMPDg0OJ72AH/rSBRXm3dlt2dnfScnjOGNNRAzNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706801431; c=relaxed/simple; bh=08XoS0YJAE2cAe1M4zQM4tbpW8Siju6TWAVzj0yIJ0g=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KMdZPPtAnODby+8YokK0TiQxKIXCS85Y0v6l+UCF5zoPFdpsk2Tu2+cTaRrR3ttz0Axqqluc2gcRi9lu0+E9IP6MKiLP21cOnTMCPJjUsb/X3na6VYSZu5FTAeA5d99KonBAXfQoxTiLi6iAPQIJzJoVQvczRHa+In6CMfSr1io= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706801429; 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=Pe8/Q0dR1tdOyGhCSqqSCsD9tJ5Uypai/0ZjJuq31AE=; b=FjGONhcqHo1QI8dZPb/sBnwdd6T8Ppa9GUr48LrFlUlu8sncPoHCY7paqBSXADiNycv1h5 U12xE/GutzHIsnWbvSHFFeNukY6e8POqVudpLXsp9e+JjWr8XBQT0ywXmMDs867RkPcrUS pnrPZtyLaQ1VHHR3YEMFKCKSZG9UGAM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-170-NvKyMP4MO8uY-fxlUFQoPA-1; Thu, 01 Feb 2024 10:30:18 -0500 X-MC-Unique: NvKyMP4MO8uY-fxlUFQoPA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 6E709130A213; Thu, 1 Feb 2024 15:30:02 +0000 (UTC) Received: from localhost (unknown [10.42.28.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C096200F703; Thu, 1 Feb 2024 15:30:02 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Do not use def-file-line for each macro in Date: Thu, 1 Feb 2024 15:29:10 +0000 Message-ID: <20240201152957.2137612-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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_H5, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux. Pushed to trunk. -- >8 -- These line markers are not needed, because searching for a macro name works fine. Removing them means that small changes to do not result in large diffs to because of all the changed line numbers. libstdc++-v3/ChangeLog: * include/bits/version.tpl: Do not use def-file-line for each macro being defined. * include/bits/version.h: Regenerate. --- libstdc++-v3/include/bits/version.h | 186 -------------------------- libstdc++-v3/include/bits/version.tpl | 3 +- 2 files changed, 1 insertion(+), 188 deletions(-) diff --git a/libstdc++-v3/include/bits/version.tpl b/libstdc++-v3/include/bits/version.tpl index ac7c331f137..4a7d5e29c10 100644 --- a/libstdc++-v3/include/bits/version.tpl +++ b/libstdc++-v3/include/bits/version.tpl @@ -125,8 +125,7 @@ h }*/ /*{ FOR ftms - }*/// /*{ (def-file-line "name") }*/ -#if !defined(__cpp_lib_/*{name}*/) + }*/#if !defined(__cpp_lib_/*{name}*/) /*{ FOR values }*//*{ # This macro block defines two versions of each FTM: