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/arch/arm/types.hh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/arch/arm/types.hh')

diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index c54bfb5f4..29828be75 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -45,7 +45,6 @@
 
 #include "arch/generic/types.hh"
 #include "base/bitunion.hh"
-#include "base/hashmap.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "debug/Decoder.hh"
@@ -483,7 +482,7 @@ namespace ArmISA
         }
 
         void
-        serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE
+        serialize(CheckpointOut &cp) const override
         {
             Base::serialize(cp);
             SERIALIZE_SCALAR(flags);
@@ -494,7 +493,7 @@ namespace ArmISA
         }
 
         void
-        unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE
+        unserialize(CheckpointIn &cp) override
         {
             Base::unserialize(cp);
             UNSERIALIZE_SCALAR(flags);
@@ -740,7 +739,7 @@ namespace ArmISA
 
 } // namespace ArmISA
 
-__hash_namespace_begin
+namespace std {
 
 template<>
 struct hash<ArmISA::ExtMachInst> :
@@ -752,6 +751,6 @@ struct hash<ArmISA::ExtMachInst> :
 
 };
 
-__hash_namespace_end
+}
 
 #endif
-- 
cgit v1.2.3