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/arch/x86/types.hh | |
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/arch/x86/types.hh')
-rw-r--r-- | src/arch/x86/types.hh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/x86/types.hh b/src/arch/x86/types.hh index 88b000b6e..99e2c826c 100644 --- a/src/arch/x86/types.hh +++ b/src/arch/x86/types.hh @@ -45,7 +45,6 @@ #include "arch/generic/types.hh" #include "base/bitunion.hh" #include "base/cprintf.hh" -#include "base/hashmap.hh" #include "base/types.hh" #include "sim/serialize.hh" @@ -346,7 +345,7 @@ namespace X86ISA } -__hash_namespace_begin +namespace std { template<> struct hash<X86ISA::ExtMachInst> { size_t operator()(const X86ISA::ExtMachInst &emi) const { @@ -362,7 +361,7 @@ __hash_namespace_begin emi.stackSize ^ emi.dispSize; }; }; -__hash_namespace_end +} // These two functions allow ExtMachInst to be used with SERIALIZE_SCALAR // and UNSERIALIZE_SCALAR. |