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/cpu/testers/rubytest/CheckTable.cc | 2 +-
 src/cpu/testers/rubytest/CheckTable.hh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/cpu/testers/rubytest')

diff --git a/src/cpu/testers/rubytest/CheckTable.cc b/src/cpu/testers/rubytest/CheckTable.cc
index decdd20a2..b75fd0a52 100644
--- a/src/cpu/testers/rubytest/CheckTable.cc
+++ b/src/cpu/testers/rubytest/CheckTable.cc
@@ -112,7 +112,7 @@ CheckTable::getCheck(const Addr address)
 {
     DPRINTF(RubyTest, "Looking for check by address: %s", address);
 
-    m5::hash_map<Addr, Check*>::iterator i = m_lookup_map.find(address);
+    auto i = m_lookup_map.find(address);
 
     if (i == m_lookup_map.end())
         return NULL;
diff --git a/src/cpu/testers/rubytest/CheckTable.hh b/src/cpu/testers/rubytest/CheckTable.hh
index fe7109f26..23ca855d7 100644
--- a/src/cpu/testers/rubytest/CheckTable.hh
+++ b/src/cpu/testers/rubytest/CheckTable.hh
@@ -31,9 +31,9 @@
 #define __CPU_RUBYTEST_CHECKTABLE_HH__
 
 #include <iostream>
+#include <unordered_map>
 #include <vector>
 
-#include "base/hashmap.hh"
 #include "mem/ruby/common/Address.hh"
 
 class Check;
@@ -63,7 +63,7 @@ class CheckTable
     CheckTable& operator=(const CheckTable& obj);
 
     std::vector<Check*> m_check_vector;
-    m5::hash_map<Addr, Check*> m_lookup_map;
+    std::unordered_map<Addr, Check*> m_lookup_map;
 
     int m_num_writers;
     int m_num_readers;
-- 
cgit v1.2.3