diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:07:59 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:07:59 -0400 |
commit | 22c04190c607b9360d9a23548f8a54e83cf0e74a (patch) | |
tree | 576135962e3c9c725157b461c8009b05933bba2b /src/sim/eventq.cc | |
parent | 735c4a87665119a33443cf8d191d329c66191c6e (diff) | |
download | gem5-22c04190c607b9360d9a23548f8a54e83cf0e74a.tar.xz |
misc: Remove redundant compiler-specific defines
This patch moves away from using M5_ATTR_OVERRIDE and the m5::hashmap
(and similar) abstractions, as these are no longer needed with gcc 4.7
and clang 3.1 as minimum compiler versions.
Diffstat (limited to 'src/sim/eventq.cc')
-rw-r--r-- | src/sim/eventq.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc index 604de4a71..698ecd116 100644 --- a/src/sim/eventq.cc +++ b/src/sim/eventq.cc @@ -35,9 +35,9 @@ #include <cassert> #include <iostream> #include <string> +#include <unordered_map> #include <vector> -#include "base/hashmap.hh" #include "base/misc.hh" #include "base/trace.hh" #include "cpu/smt.hh" @@ -319,7 +319,7 @@ EventQueue::dump() const bool EventQueue::debugVerify() const { - m5::hash_map<long, bool> map; + std::unordered_map<long, bool> map; Tick time = 0; short priority = 0; |