From patchwork Fri Aug 27 20:57:16 2021 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: 1521789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=ifcGGLwR; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GxBqr3xqQz9sPf for ; Sat, 28 Aug 2021 06:57:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 703013857C71 for ; Fri, 27 Aug 2021 20:57:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 703013857C71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1630097859; bh=Kz5Cs1sDutjnyTwn0eHiXqGr96dw36GnJEKin3gJcg4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=ifcGGLwRf/W2j1TmZDTywSzcafeE9kidWsiPNVO6ejTSPgydJcv3XeQxo7udAA59W aYhzhFTxihZk0VvCkt0ZEW8EkzpczPb3C4tn6US7AX9+k85OLeoC1Art0WzFuEa6ES xKlUD2XfaDplmeza5iOqAxHLL4cphhpxcYNJSx78= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id D2ACA3858C60; Fri, 27 Aug 2021 20:57:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D2ACA3858C60 Received: by mail-wr1-x434.google.com with SMTP id t15so6072869wrg.7; Fri, 27 Aug 2021 13:57:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language; bh=Kz5Cs1sDutjnyTwn0eHiXqGr96dw36GnJEKin3gJcg4=; b=BiAIvVjWL0xyQ0kzpMRVgzLDCqQjhA2gHVlmbns9oU3ge7xbjhGSKsoPe7tRmCWaNJ 1YZJutGbnUBLpWRnE/cPgs+xSxo0XbK6Yt08Kn1z+OOY9KVOOjTF4toXV66B57znZ2tN p67irsOV9w0Fz3ifbnBIS7/d4oNWFcu51FjNV9BUxee5fKYPmz4VAcRIQg5/mgv2QkuE TabFP9NFW7t8/K1Dk/6FHXurnvjVnITkltdQbBiHsNZYiMv1CM0vV60KP4avM0eXI9pU 5IcH366/vXTZgnoO2iiVUXgly47Ap1BVmFnhseAlBIby4XhgqLObR0OvonQYqJeFiNU5 8mjw== X-Gm-Message-State: AOAM532eotszq0oLPkvc0KQz0GbCW62XYMnmUlu8voDoDU0DqTdvY+4E JLV62gdcGpdzFYqTciS/fn/pb5uM66o= X-Google-Smtp-Source: ABdhPJztPkuIj5VMMOKHGxwp+cev4aItj0MusnFSxWx2NbsRd3wITSpr8Zc9+XvSm262N9mVWiwl4g== X-Received: by 2002:adf:c148:: with SMTP id w8mr4999630wre.317.1630097837662; Fri, 27 Aug 2021 13:57:17 -0700 (PDT) Received: from ?IPv6:2a01:e0a:1dc:b1c0:7c7d:a3b9:e65:f324? ([2a01:e0a:1dc:b1c0:7c7d:a3b9:e65:f324]) by smtp.googlemail.com with ESMTPSA id l187sm6523443wml.39.2021.08.27.13.57.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Aug 2021 13:57:17 -0700 (PDT) To: "libstdc++@gcc.gnu.org" Subject: [PATCH] Fix inline versioned namespace bootstrap Message-ID: Date: Fri, 27 Aug 2021 22:57:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 Content-Language: fr X-Spam-Status: No, score=-11.6 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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?= Cc: gcc-patches Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Since std::allocator is not specialized anymore in _GLIBCXX_INLINE_VERSION mode _ExtPtr_allocator specialization do not compile because std::allocator is incomplete. So I think primary _ExtPtr_allocator template should also be prefered in _GLIBCXX_INLINE_VERSION mode. Ok to commit ? François diff --git a/libstdc++-v3/include/ext/extptr_allocator.h b/libstdc++-v3/include/ext/extptr_allocator.h index 7d8aaac7cee..78ee1fa039f 100644 --- a/libstdc++-v3/include/ext/extptr_allocator.h +++ b/libstdc++-v3/include/ext/extptr_allocator.h @@ -162,6 +162,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::allocator<_Tp> _M_real_alloc; }; +#if ! _GLIBCXX_INLINE_VERSION // _ExtPtr_allocator specialization. template<> class _ExtPtr_allocator @@ -183,6 +184,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION private: std::allocator _M_real_alloc; }; +#endif template inline void