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/mem/page_table.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/mem/page_table.hh')
| -rw-r--r-- | src/mem/page_table.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh index ddec104a7..7dcbbd65a 100644 --- a/src/mem/page_table.hh +++ b/src/mem/page_table.hh @@ -38,10 +38,10 @@ #define __MEM_PAGE_TABLE_HH__ #include <string> +#include <unordered_map> #include "arch/isa_traits.hh" #include "arch/tlb.hh" -#include "base/hashmap.hh" #include "base/types.hh" #include "config/the_isa.hh" #include "mem/request.hh" @@ -200,7 +200,7 @@ class PageTableBase : public Serializable class FuncPageTable : public PageTableBase { private: - typedef m5::hash_map<Addr, TheISA::TlbEntry> PTable; + typedef std::unordered_map<Addr, TheISA::TlbEntry> PTable; typedef PTable::iterator PTableItr; PTable pTable; @@ -235,8 +235,8 @@ class FuncPageTable : public PageTableBase */ bool lookup(Addr vaddr, TheISA::TlbEntry &entry); - void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE; - void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE; + void serialize(CheckpointOut &cp) const override; + void unserialize(CheckpointIn &cp) override; }; /** |