From patchwork Wed Sep 20 04:51:05 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: 1836982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=AAw5CVHd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; 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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4Rr5ht2zwYz1ynF for ; Wed, 20 Sep 2023 14:51:25 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2853B3858291 for ; Wed, 20 Sep 2023 04:51:23 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 30F653858D20; Wed, 20 Sep 2023 04:51:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30F653858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9aa0495f9cfso105599566b.1; Tue, 19 Sep 2023 21:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695185467; x=1695790267; darn=gcc.gnu.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=QZ2feaE634qFNcg+nNj/K/NMz6EGvblUHpn2uai09Rk=; b=AAw5CVHd4VN1ClaCqy6s2F50ZVnofg5HPKcKHpjSgkq3K8FAiqhnf/MCUjWjdcoRWM zOSESV23fWfIgN1tWG3dmZTPSfwHbrThfNw7p+Aaols4ynjTfjA7+Jir7bINzc4WQodz 841aiDA+X1tsQHG+5urmxXgOvo2TwIFGtwJcYKBL936Xd6sh/jIFxvA3iB40kz+ECelb eIDXOXgLxTFA5Q8n0wrdn+r6DcR0FS9Xf6zR/usZwqZRWl0wiRSXxvdreGL15Cdu+vet rA/iAO38iKtv8cQZsAr+etkELx84Lr2Ya91eIzfbvJL3WgrQRxbPp5tv8W9w+TwDvonZ zOzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695185467; x=1695790267; 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=QZ2feaE634qFNcg+nNj/K/NMz6EGvblUHpn2uai09Rk=; b=LEc6vY+J+RyBoE+7DOsoBsvBUv3gkuJpMkGyj1Hmbfv02+F0S7drBjaT0D8eQOJxI4 FP6B8d3kFcZ/eSrPjUBSLsBdwyoi6kb3FdRqkMhBjGPjkikWYELUM+Jg/buySnzLxTft 0maTpzYM1HSeaUA4BOknU56yIb7Uht7vAHDcbR1FabCbIYjNxzA4KPDVC/OZ0MCvkejW xhUyzKBmTo5I+LY10ci6JmUE+CMyJQaLLMhxoR5qMaAyZ/zdPFdawypSPQrPPVqT78/d pSQP+iSThZKHkGpPS/Y+zwEW2vedAr+XWT08nBB34/mJZ0kQYWP9XyZygHzVk4yJxrfN R4oA== X-Gm-Message-State: AOJu0YxrCTZ68j7VEegoz/5bRUD37js/nf1FgHR8xI/Pga4f8ghsHLqN uQlunBLqcgxTl9zGi+eXcI+a3uBwHvuQMA== X-Google-Smtp-Source: AGHT+IGK1Yc8bdbxDs/oYxP4BUgQA7ahtLBATocScWbkru0sqAfbWO28Ns+MO8z2kSY7b3wwDHzHJg== X-Received: by 2002:a17:906:6a02:b0:9a5:83f0:9bc5 with SMTP id qw2-20020a1709066a0200b009a583f09bc5mr6260502ejc.18.1695185467137; Tue, 19 Sep 2023 21:51:07 -0700 (PDT) Received: from [10.25.0.76] ([89.207.171.100]) by smtp.gmail.com with ESMTPSA id z19-20020a170906435300b009aa292a2df2sm8694842ejm.217.2023.09.19.21.51.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Sep 2023 21:51:06 -0700 (PDT) Message-ID: <55f0212a-f8d3-aa9e-8788-f5165484ac6c@gmail.com> Date: Wed, 20 Sep 2023 06:51:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: libstdc++ Cc: gcc-patches From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Subject: [PATCH][_GLIBCXX_INLINE_VERSION] Fix X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.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 libstdc++: Remove std::constract_violation from versioned namespace GCC expects this type to be in std namespace directly. libstdc++-v3/ChangeLog:     * include/experimental/contract:     Remove _GLIBCXX_BEGIN_NAMESPACE_VERSION/_GLIBCXX_END_NAMESPACE_VERSION. It does fix 29 g++.dg/contracts in gcc testsuite. Ok to commit ? François diff --git a/libstdc++-v3/include/experimental/contract b/libstdc++-v3/include/experimental/contract index fbf5ed01d8b..8bc12380cec 100644 --- a/libstdc++-v3/include/experimental/contract +++ b/libstdc++-v3/include/experimental/contract @@ -39,7 +39,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { -_GLIBCXX_BEGIN_NAMESPACE_VERSION namespace experimental { @@ -71,7 +70,6 @@ namespace experimental } // namespace experimental -_GLIBCXX_END_NAMESPACE_VERSION } // namespace std // To override the contract violation handler, define