diff options
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/inferiors.h | 8 | ||||
| -rw-r--r-- | gdbserver/linux-aarch64-tdesc.cc | 4 | ||||
| -rw-r--r-- | gdbserver/server.cc | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/gdbserver/inferiors.h b/gdbserver/inferiors.h index 5372a3c..a0635de 100644 --- a/gdbserver/inferiors.h +++ b/gdbserver/inferiors.h @@ -19,13 +19,11 @@ #ifndef GDBSERVER_INFERIORS_H #define GDBSERVER_INFERIORS_H -#include "gdbsupport/gdb_vecs.h" #include "gdbsupport/owning_intrusive_list.h" +#include "gdbsupport/unordered_map.h" #include "dll.h" -#include <unordered_map> - struct thread_info; struct regcache; struct target_desc; @@ -94,7 +92,7 @@ struct process_info : public intrusive_list_node<process_info> { return m_thread_list; } /* Return a reference to the private thread map. */ - std::unordered_map<ptid_t, thread_info *> &thread_map () + gdb::unordered_map<ptid_t, thread_info *> &thread_map () { return m_ptid_thread_map; } /* Find the first thread for which FUNC returns true. Return nullptr if no @@ -118,7 +116,7 @@ private: /* A map of ptid_t to thread_info*, for average O(1) ptid_t lookup. Exited threads do not appear in the map. */ - std::unordered_map<ptid_t, thread_info *> m_ptid_thread_map; + gdb::unordered_map<ptid_t, thread_info *> m_ptid_thread_map; }; /* Return a pointer to the current process. Note that the current diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc index 39d5bcc..52642d5 100644 --- a/gdbserver/linux-aarch64-tdesc.cc +++ b/gdbserver/linux-aarch64-tdesc.cc @@ -24,7 +24,7 @@ #include "arch/aarch64.h" #include "linux-aarch32-low.h" #include <inttypes.h> -#include <unordered_map> +#include "gdbsupport/unordered_map.h" /* Create the aarch64 target description. */ @@ -35,7 +35,7 @@ aarch64_linux_read_description (const aarch64_features &features) this function as the in-process-agent calls this function from a constructor function, when globals might not yet have been initialised. */ - static std::unordered_map<aarch64_features, target_desc *> tdesc_aarch64_map; + static gdb::unordered_map<aarch64_features, target_desc *> tdesc_aarch64_map; if (features.vq > AARCH64_MAX_SVE_VQ) error (_("VQ is %" PRIu64 ", maximum supported value is %d"), features.vq, diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 0697956..6e11b2e 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -35,7 +35,7 @@ #include "dll.h" #include "hostio.h" #include <vector> -#include <unordered_map> +#include "gdbsupport/unordered_map.h" #include "gdbsupport/common-inferior.h" #include "gdbsupport/job-control.h" #include "gdbsupport/environ.h" @@ -947,7 +947,7 @@ handle_general_set (char *own_buf) It's nicer if we only print the final options for each TID, and if we only print about it if the options changed compared to the options that were previously set on the thread. */ - std::unordered_map<thread_info *, gdb_thread_options> set_options; + gdb::unordered_map<thread_info *, gdb_thread_options> set_options; while (*p != '\0') { |