diff mbox series

[09/19] Use gdb unordered map for complaints

Message ID	20250317-replace-std-stuff-v1-9-7ba4ee88e218@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A4473858424 From: Tom Tromey <tom@tromey.com> 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 <tom@tromey.com> Precedence: list Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org
Series	Convert std::unordered_{set,map} to gdb implementations \| [00/19] Convert std::unordered_{set,map} to gdb implementations [01/19] Use gdb unordered set and map in corelow.c [02/19] Use gdb unordered set in breakpoint.c [03/19] Use gdb unordered map in dictionary.c [04/19] Use gdb unordered map in gdb_bfd.c [05/19] Use gdb unordered set in symtab.c [06/19] Use gdb unordered map in ada-exp.y [07/19] Use gdb unordered map in inferior.h [08/19] Use gdb unordered map in stap-probe.c [09/19] Use gdb unordered map for complaints [10/19] Use gdb unordered map in linux-nat.c [11/19] Use gdb unordered set in linux-procfs.c [12/19] Use gdb unordered set and map in Python layer [13/19] Use gdb unordered map in ravenscar.c [14/19] Use gdb unordered map in target.c [15/19] Use gdb unordered set and map in unit tests [16/19] Use gdb unordered map in xml-tdesc.c [17/19] Use gdb unordered set and map in cp-namespace.c [18/19] Use gdb unordered map in tui-io.c [19/19] Use gdb unordered map in regcache.c

Commit Message

Tom Tromey March 18, 2025, 2:15 a.m. UTC

  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 mbox series

Patch

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 <unordered_map>
+#include "gdbsupport/unordered_map.h"
 #if CXX_STD_THREAD
 #include <mutex>
 #endif
 
 /* Map format strings to counters.  */
 
-static std::unordered_map<const char *, int> counters;
+static gdb::unordered_map<const char *, int> 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<const char *, int> tmp;
+  gdb::unordered_map<const char *, int> 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 <unordered_set>
+#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<std::string> complaint_collection;
+typedef gdb::unordered_set<std::string> complaint_collection;
 
 /* A class that can handle calls to complaint from multiple threads.
    When this is instantiated, it hooks into the complaint mechanism,