From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id E418F3864C64 for ; Thu, 9 Nov 2023 19:49:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E418F3864C64 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E418F3864C64 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1035 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699559396; cv=none; b=s7A/MHQ3nyVNJdAZOSBmdfkiyR8FGLuIe5WfR+f72V2K+fR9wMJMN0dESVssONlz04gpq3LtBaScGrquAVdAldcexIDd6k5yuJSIDZaA0XBl5gLNUcmJEbQrC/loYgT624zvi5gaeMTRqrCjeYFt+KelvasGsuAyISsPdkSofIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699559396; c=relaxed/simple; bh=pxU61yN2TgnKXavGi7f7ZQaXygtgHt6GtxI+hdrsj58=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RBu1LuHFqSVaZj2k5jDuK/drfA66MOurThVC34MLdvTNucSBWdCOnovuHTaUHfY8dls4+y1/Z7d8sjLXoPjbo+UixU2k931PtX5cte9dhAISG7GO9+ffjsH37XS6vw3b/32wkRzxgPl7aR6VqsnYTjY2r9+8NGBwTzNiFS1z5yM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-282fcf7eef9so538790a91.1 for ; Thu, 09 Nov 2023 11:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1699559394; x=1700164194; darn=gcc.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=p/uNA5spk3EKTu7AFXwxrHiN/lPZrYSY+pNO7Z5Xp24=; b=iWrwYT/LutYWVCvy84/26TfnsNHJYLEABad1JqNhoaZT8ZTQphGHAjJisd/K/SvZQo NnxNdV8dQyocV7++PpRyLdllXksky6wAj/XhbkuLnPxlhTc8222N2pdnTse1ZGDwqYzc 9Qz8DXW19fyOlKTBKnNNgI5bzHFhVB5kjYpqI0TkNnlL7pjUmgCbvgQysGGwtI0QHA2B rsquADUJfvmcDGttA+ZJc1exVe8pIta7VR/5XE8mVyj8epltRwnIGt9ijmVsKgdEaety PiHqptA0YbnmtWjCEkkoshV2vB33SgctNgnRSgzGVP0jB5zio/J4C7fjGoy6vwnmCNUT M2qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699559394; x=1700164194; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p/uNA5spk3EKTu7AFXwxrHiN/lPZrYSY+pNO7Z5Xp24=; b=cQtbyznBYSgYS0EvDw8xS7g5U3m1ZJ+5q6fyoh23E1oqghnzV8qXFL00+JEyUjP8f+ rEcdReki0sXL4qHxEieJdGrHKEkI9E09NnlEy1jnev3fFt++IJTA5Qk/8QJfLgi4zbkY yf9w/lxk8auHVLnlae7+wpVCnG2OuR1+7Szx7g05Jo7LPOEPV2rEQfkHHXtpEvxbBDGm 7z0LY+ZbvFevhtHZM0cZkxXG9T81fT3Y8g5nwLqtk5Hzk8X26jBfNkIryRhxNjqeHc+1 BVG3jTxtBPrNBagGkdVSdbtRIbpuniPPTzLE6vpVAt4RuVv7R5VcJYI42rr+iqGtmRip Mn8w== X-Gm-Message-State: AOJu0YxLp6eZ09LkqswtdgJVIQNhbsomETQB3xTpaKn01rIm0UmWE7sz UcPaI9HILBz7uNQ+nhaR3C7DmA== X-Google-Smtp-Source: AGHT+IGBiTMSAUiCjRG159m3kyH9bFofnZKRcZqUtjT6UUEYUj/neiM0nq9+vpNiAUzrFM51YAuuFQ== X-Received: by 2002:a17:90b:4a91:b0:27d:1df4:26f3 with SMTP id lp17-20020a17090b4a9100b0027d1df426f3mr2752451pjb.15.1699559393810; Thu, 09 Nov 2023 11:49:53 -0800 (PST) Received: from free.home ([2804:7f1:2080:e9c8:ff5e:88e8:a900:d7b4]) by smtp.gmail.com with ESMTPSA id 25-20020a17090a035900b00282ec3582f1sm171070pjf.34.2023.11.09.11.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 11:49:52 -0800 (PST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 3A9JncN92262691 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 9 Nov 2023 16:49:40 -0300 From: Alexandre Oliva To: Jonathan Wakely Cc: =?utf-8?Q?Fran=C3=A7ois?= Dumont , Jonathan Wakely , "libstdc++" Subject: [PATCH] libstdc++: bvector: undef always_inline macro Organization: Free thinker, does not speak for AdaCore References: <0e2723e5-a60d-484e-b4f4-951bc8dfde8d@gmail.com> Date: Thu, 09 Nov 2023 16:49:37 -0300 In-Reply-To: (Jonathan Wakely's message of "Thu, 9 Nov 2023 08:16:12 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Nov 9, 2023, Jonathan Wakely wrote: > But I've just realised we probably want to #undef the macro at the end > of bits/stl_bvector.h too. I'm not sure why (what if another libstdc++ header were to define the macro, includes stl_bvector.h, and then use the macro expecting it to still be there?), but I suppose this is what you mean. Regstrapped on x86_64-linux-gnu just to be sure. Ok to install? From: Alexandre Oliva It's customary to undefine temporary internal macros at the end of the header that defines them, even such widely-usable ones as _GLIBCXX_ALWAYS_INLINE, so do so in the header where the define was recently introduced. for libstdc++-v3/ChangeLog * include/bits/stl_bvector.h (_GLIBCXX_ALWAYS_INLINE): Undef. --- libstdc++-v3/include/bits/stl_bvector.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 2b91af2005f2d..1b7648535c523 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -1628,4 +1628,6 @@ _GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_VERSION } // namespace std +#undef _GLIBCXX_ALWAYS_INLINE + #endif -- Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer More tolerance and less prejudice are key for inclusion and diversity Excluding neuro-others for not behaving ""normal"" is *not* inclusive