From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UM3sCejY2GdQYxMAWB0awg (envelope-from ) for ; Mon, 17 Mar 2025 22:22:32 -0400 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=dQj9waQx; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 252011E100; Mon, 17 Mar 2025 22:22:32 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A8E071E05C for ; Mon, 17 Mar 2025 22:22:31 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 570D23857C5F for ; Tue, 18 Mar 2025 02:22:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 570D23857C5F Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=dQj9waQx Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id 8A4473858424 for ; Tue, 18 Mar 2025 02:15:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A4473858424 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8A4473858424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; cv=none; b=LzJNvtyp/HeEvfeBKuaODj8/Lfzq7dS/ULY4OELSEHBiQAVLIS3QeWrTRz8YWegOjUMKb+cr9Wt+KMXYnvzC+rq6d+1rgdDwsyPKRnePwPgQgSlgVLc6YMKvhPxQP9VIMdg2V952adVmbQcd7NlpEmD5oxKOovoxVzX/DtgvWBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264103; c=relaxed/simple; bh=kwO91Z+2cGra0ctanZA6mmpWxBTdc7TqtguLNpCoWjk=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mwacNiLE3Bcov+/DLNcuOmDl7RHvgAZ34Oqr2QKtoyWsQN7UWg/IHbS0jT07FOzv8P+/MV80d/9crH5baeb3iXpggdQb3x6GzrHK47A6NE5Exchga6hVZHPLre29Cx7ptcqZRYZICJEhL8B3dtlpTwICX3UrZ8EeSYr1lH1tgqQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A4473858424 Received: from eig-obgw-6003a.ext.cloudfilter.net ([10.0.30.151]) by cmsmtp with ESMTPS id uDlttYCBciuzSuMTvtc7bH; Tue, 18 Mar 2025 02:15:03 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTutgOCKh9ZxuMTutwn7x; Tue, 18 Mar 2025 02:15:02 +0000 X-Authority-Analysis: v=2.4 cv=GODDEfNK c=1 sm=1 tr=0 ts=67d8d726 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=P1DBSZlDPrl8jKiv5j0A:9 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=urKZ4ZcjiuIr7FKwRt3tCRSEsxUvqhtDWC28PFketX4=; b=dQj9waQxFyNJjpxCldNMTGImDY ltJ8caeXmqci3alYa4stCUo9EbGie1AQ62zqihpWBbltvrj0h+B3k4sTHxbEVwcj8XSgBWhOY4w1h 9j3oEFos4+4CaLml8t57M9I4N; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTt-00000002cIx-2jw8; Mon, 17 Mar 2025 20:15:01 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:02 -0600 Subject: [PATCH 09/19] Use gdb unordered map for complaints MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250317-replace-std-stuff-v1-9-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.96.32 X-Source-L: No X-Exim-ID: 1tuMTt-00000002cIx-2jw8 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfISoOOsTJ+9qYVfxPS//d6g8dPHRuJ2ti8fjZsLLp2Oa9aRjRFacDrZ/c+owrOhscyVkXwf4+3DRuwfUCrIQm1TDejnbxdGxkHvHJ902/hZkUXwbRwOL UTSQvF9RvZ/zpDhSlPd0QJiicRdY0Ha7w4FWJKojVGA61V9ZZjjLDiBowoBaktoyDTfMSBNWVnv1RhVTrriNYp+oNyFneFH1DbU= X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This changes the complaints code to use gdb::unordered_map. --- gdb/complaints.c | 6 +++--- gdb/complaints.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/complaints.c b/gdb/complaints.c index b50bea846790cf83fe09ae04c83c2f786f34311b..80b358c8dd165d7ed432563dea0f1a46833d30d1 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -23,14 +23,14 @@ #include "run-on-main-thread.h" #include "top.h" #include "gdbsupport/selftest.h" -#include +#include "gdbsupport/unordered_map.h" #if CXX_STD_THREAD #include #endif /* Map format strings to counters. */ -static std::unordered_map counters; +static gdb::unordered_map counters; /* How many complaints about a particular thing should be printed before we stop whining about it? Default is no whining at all, @@ -149,7 +149,7 @@ namespace selftests { static void test_complaints () { - std::unordered_map tmp; + gdb::unordered_map tmp; scoped_restore reset_counters = make_scoped_restore (&counters, tmp); scoped_restore reset_stop_whining = make_scoped_restore (&stop_whining, 2); diff --git a/gdb/complaints.h b/gdb/complaints.h index 3d0e0babd836a667134edf4b6ecb22a5b3d53490..20650671404be9988a0b58a976d1b1aad6e83045 100644 --- a/gdb/complaints.h +++ b/gdb/complaints.h @@ -21,7 +21,7 @@ #define GDB_COMPLAINTS_H #include "gdbsupport/scoped_restore.h" -#include +#include "gdbsupport/unordered_set.h" /* Helper for complaint. */ extern void complaint_internal (const char *fmt, ...) @@ -59,7 +59,7 @@ extern void clear_complaints (); /* Type of collected complaints. */ -typedef std::unordered_set complaint_collection; +typedef gdb::unordered_set complaint_collection; /* A class that can handle calls to complaint from multiple threads. When this is instantiated, it hooks into the complaint mechanism, -- 2.46.1