From 22c04190c607b9360d9a23548f8a54e83cf0e74a Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 12 Oct 2015 04:07:59 -0400
Subject: 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.
---
 src/mem/mem_checker.hh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mem/mem_checker.hh')

diff --git a/src/mem/mem_checker.hh b/src/mem/mem_checker.hh
index 0ec0f08df..6ceca74a7 100644
--- a/src/mem/mem_checker.hh
+++ b/src/mem/mem_checker.hh
@@ -44,9 +44,9 @@
 #include <list>
 #include <map>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
-#include "base/hashmap.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "debug/MemChecker.hh"
@@ -184,7 +184,7 @@ class MemChecker : public SimObject
          * Map of Serial --> Transaction of all writes in cluster; contains
          * all, in-flight or already completed.
          */
-        m5::hash_map<Serial, Transaction> writes;
+        std::unordered_map<Serial, Transaction> writes;
 
       private:
         Tick completeMax;
@@ -509,7 +509,7 @@ class MemChecker : public SimObject
      *
      * Access via getByteTracker()!
      */
-    m5::hash_map<Addr, ByteTracker> byte_trackers;
+    std::unordered_map<Addr, ByteTracker> byte_trackers;
 };
 
 inline MemChecker::Serial
-- 
cgit v1.2.3