From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id B8182385624F for ; Tue, 15 Aug 2023 18:13:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B8182385624F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5781C1FD66 for ; Tue, 15 Aug 2023 18:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692123217; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1f0Ttu3VY4KlR28/rOEKKGHrgDqlSXHZO3cVFW2hFVE=; b=lOje+r2rG3u41eq+ahBZhlpYNOH6mAAvLtFCxP41BEjlwY8UHrrt75AUbx4y8eBBvECH7L 41Oqe9n7rlfIPYLTYinChp76hoPGXa9WCqNUuXfuZCmOmNHv44F8Q941vIj7SbdSLlVgQd jd3eaFbzEA5N4pqwwLUPZpDVF+4+F1Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692123217; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1f0Ttu3VY4KlR28/rOEKKGHrgDqlSXHZO3cVFW2hFVE=; b=YjgdOKla612/R92lXV1UQwA5A5b27f6+1GwZQcDXqetWk8L6HvCNohS3WRpF2KgN1IqqnW 2PbaMDj8dcmoQrDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 456191353E for ; Tue, 15 Aug 2023 18:13:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YI7ZD1HA22RuQAAAMHmgww (envelope-from ) for ; Tue, 15 Aug 2023 18:13:37 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 7/7] [gdb/build, c++20] Handle deprecated std::allocator::construct Date: Tue, 15 Aug 2023 20:13:09 +0200 Message-Id: <20230815181309.8595-8-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230815181309.8595-1-tdevries@suse.de> References: <20230815181309.8595-1-tdevries@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: When building gdb with -std=c++20, I run into: ... gdbsupport/default-init-alloc.h:52:12: error: ‘construct’ has not been \ declared in ‘class std::allocator’ 52 | using A::construct; | ^~~~~~~~~ ... Indeed, std::allocator::construct has been deprecated in c++17 and removed in c++20. Fix this by using instead std::pmr::polymorphic_allocator for c++20. Tested on x86_64-linux. --- gdbsupport/default-init-alloc.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gdbsupport/default-init-alloc.h b/gdbsupport/default-init-alloc.h index 9c8b5a2c689..e2d3bd24516 100644 --- a/gdbsupport/default-init-alloc.h +++ b/gdbsupport/default-init-alloc.h @@ -18,6 +18,10 @@ #ifndef COMMON_DEFAULT_INIT_ALLOC_H #define COMMON_DEFAULT_INIT_ALLOC_H +#if __cplusplus >= 202002L +#include +#endif + namespace gdb { /* An allocator that default constructs using default-initialization @@ -29,7 +33,14 @@ namespace gdb { adapter that given an allocator A, overrides 'A::construct()'. 'A' defaults to std::allocator. */ -template> +template= 202002L + = std::pmr::polymorphic_allocator +#else + = std::allocator +#endif + > class default_init_allocator : public A { public: -- 2.35.3