From: Tom Tromey <tom@tromey.com>
Date: Tue, 11 Mar 2025 17:19:43 +0000 (-0600)
Subject: Use gdb unordered map for complaints
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd0f7432a8b6c833b254c7a547d10f320c0b2d8a;p=thirdparty%2Fbinutils-gdb.git

Use gdb unordered map for complaints

This changes the complaints code to use gdb::unordered_map.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---

diff --git a/gdb/complaints.c b/gdb/complaints.c
index b50bea84679..80b358c8dd1 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 3d0e0babd83..20650671404 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,