From patchwork Sun Jul 30 13:55:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Patchwork-Id: 128228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1512490vqg; Sun, 30 Jul 2023 06:56:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlEZ9+ftnA0tRg8Yib6Pz6p9MZLKMmDaXcgvz+PfUjnAXJ/jhG1qjhS0ASMmF7Cl1n7V50Zr X-Received: by 2002:aa7:c149:0:b0:522:29ee:2ab with SMTP id r9-20020aa7c149000000b0052229ee02abmr7577160edp.14.1690725388511; Sun, 30 Jul 2023 06:56:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690725388; cv=none; d=google.com; s=arc-20160816; b=tjfpQX2OxW3YYVyZ/0e3xnXYTK/XUgIZweqfkTrj3RNpLVABx5nyuGAfzxCcA8mJRI GyFcB4oozwBHrTgPLWTthhqMYJFeagE9+ZRfi3qiYaGzeE/6qmE8xd2PXdAU/YNTOb1n T8mcagwF/YlRf9a/Ed4DR7PSnP4Rc0prXK3DFUw+IC36pYkNusIJIDCd6gzQbka4bFIk 57BP6mfOSPKw7at+BWC7AgPirdAM/kwtviyy3X/OyXgFLQ0Gvd7bNBjh0LiabtlPhIAI R5NP0j5QZwrYFnwWOpX13NyDhfxkW1jtNB2TN0vkGrUZzsT9PdRdLFR8o3LBIhSeMn+D DLYg== 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:subject:cc:to :content-language:user-agent:mime-version:date:message-id :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=wnniUqPSOe5ItvnepHmDL4UrDm5FzRNpqgM59SU0CLY=; fh=I2ZikstH4IIsv8gM4OvoosTgP0ASJj6WB/YQ3XqwPBs=; b=ZRec2Jth/79Is22YMfjllRSDbqyaLYn3kEcLXEDcK1MQEYDWqrtbw7avT48q547ATl 7tY7KrwU56T1x2RpgSfcL/4eLXU5y3d6iiR5b6j+LNJUlVswLRBp6Dy9tsMYhnd9gB+f RjOoN2M85GOnO98ItmgUtaG0pvV5qN9mURzW+tjoTCpTjUMRdnqWW/lFwMivmMjwARDy eqh26fzo39Y+5LjCabySJYpInXOjceLbSUhQ4MIh0apgf7BcAW0H2SjZ5Set61g1+VG3 BU+0LCedHbIhaZE+rvsxqMsyzPMy2y4RKC0WmKHGkupcXoajny16uFh90oRVYZeoQVJ/ lHAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=TknyKbTl; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id f18-20020a056402151200b0052257c0e629si5999471edw.316.2023.07.30.06.56.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jul 2023 06:56:28 -0700 (PDT) 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=TknyKbTl; 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 12FF9385771C for ; Sun, 30 Jul 2023 13:56:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 12FF9385771C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1690725367; bh=wnniUqPSOe5ItvnepHmDL4UrDm5FzRNpqgM59SU0CLY=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=TknyKbTlf+UtYQu49vUF5HjdmCjzii8rPCwXpM0H3fT40WFI9plmYU9bRN1teqHWN JPStZWDWHiEhygsw+IO4Hk5p70YLKtPye/iBSN4eUFg4iGJYWkUdX2g1t0Cn+YajkT 4JEctjybAk2kOO1MMutzLb7B2FHDz2SuvGEkEz0w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id BD4A53858D35; Sun, 30 Jul 2023 13:55:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD4A53858D35 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fe078dcc3aso19484205e9.2; Sun, 30 Jul 2023 06:55:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690725321; x=1691330121; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wnniUqPSOe5ItvnepHmDL4UrDm5FzRNpqgM59SU0CLY=; b=Yb0+8zRAGXyTCMeOKTWqyDKh95dH6nsQneqlRq2g3Qe66T6T1hZu4ft3ZP4w0t0Sp9 ARczNOVazDFjm3bfVHhvgrLFth2PI7JJSj4mQg5FOQd+SmtzbtTPgP+RC11RiZampKGp 2yJlRETm4iOwdG92diSQ5OwRKpie4dHKYH1eJHp2GAFKqPGivVlx1jTHmjKnO+MdKKAE 6OSA1ClOO82zZ0dt3wvCTcsty78XGoaPksCLckTMkNIOfUJy5wiKNrBfC4iHLwiSg2ic FgOnbpTAXh0U4CyrFcTv4AQqo6LpxPif+RZZTPrFbXGIDgf4mSOgkc4gs+2kny7mqHwR r7BA== X-Gm-Message-State: ABy/qLbbBRqTiHW6y7rrvycFnEMp5ePOZvk0Tq/s1CnvoIx46yppcWR9 4c+5OVJgXGvBMeUzLdPpCpwrMSVEC7c= X-Received: by 2002:a5d:4f8a:0:b0:317:6c19:6445 with SMTP id d10-20020a5d4f8a000000b003176c196445mr3278358wru.39.1690725320855; Sun, 30 Jul 2023 06:55:20 -0700 (PDT) Received: from ?IPV6:2a01:e0a:1dc:b1c0:41c8:1363:21ab:5320? ([2a01:e0a:1dc:b1c0:41c8:1363:21ab:5320]) by smtp.gmail.com with ESMTPSA id c18-20020a5d4f12000000b0030647449730sm10173372wru.74.2023.07.30.06.55.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 30 Jul 2023 06:55:19 -0700 (PDT) Message-ID: <2c5a8abd-c03e-294f-74bc-9e3f3f1de393@gmail.com> Date: Sun, 30 Jul 2023 15:55:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US To: libstdc++ Cc: gcc-patches Subject: [committed] Fix several preprocessor directives X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Fran=C3=A7ois_Dumont_via_Gcc-patches?= From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Reply-To: =?utf-8?q?Fran=C3=A7ois_Dumont?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772854065167337800 X-GMAIL-MSGID: 1772854065167337800 Committed as obvious.     libstdc++: Fix several preprocessor directives     A wrong usage of #define in place of a #error seems to have been replicated     at different places in source files.     libstdc++-v3/ChangeLog:             * src/c++11/compatibility-ldbl-facets-aliases.h: Replace #define with             proper #error.             * src/c++11/locale-inst-monetary.h: Likewise.             * src/c++11/locale-inst-numeric.h: Likewise. François diff --git a/libstdc++-v3/src/c++11/compatibility-ldbl-facets-aliases.h b/libstdc++-v3/src/c++11/compatibility-ldbl-facets-aliases.h index 70c9342d88a..faf8221b273 100644 --- a/libstdc++-v3/src/c++11/compatibility-ldbl-facets-aliases.h +++ b/libstdc++-v3/src/c++11/compatibility-ldbl-facets-aliases.h @@ -23,11 +23,11 @@ // . #ifndef C -#define "This file should not be compiled directly, only included" +# error "This file should not be compiled directly, only included" #endif #ifndef _GLIBCXX_LONG_DOUBLE_COMPAT -#define "This file should only be used for _GLIBCXX_LONG_DOUBLE_COMPAT builds" +# error "This file should only be used for _GLIBCXX_LONG_DOUBLE_COMPAT builds" #endif // XXX GLIBCXX_ABI Deprecated diff --git a/libstdc++-v3/src/c++11/locale-inst-monetary.h b/libstdc++-v3/src/c++11/locale-inst-monetary.h index d8fecf26596..954de1f52cf 100644 --- a/libstdc++-v3/src/c++11/locale-inst-monetary.h +++ b/libstdc++-v3/src/c++11/locale-inst-monetary.h @@ -23,7 +23,7 @@ // . #ifndef C -#define "This file should not be compiled directly, only included" +# error "This file should not be compiled directly, only included" #endif #include "facet_inst_macros.h" diff --git a/libstdc++-v3/src/c++11/locale-inst-numeric.h b/libstdc++-v3/src/c++11/locale-inst-numeric.h index c77ee9e8d38..b917fe5802e 100644 --- a/libstdc++-v3/src/c++11/locale-inst-numeric.h +++ b/libstdc++-v3/src/c++11/locale-inst-numeric.h @@ -23,7 +23,7 @@ // . #ifndef C -#define "This file should not be compiled directly, only included" +# error "This file should not be compiled directly, only included" #endif #include "facet_inst_macros.h"