diff options
Diffstat (limited to 'src/mem/xbar.hh')
| -rw-r--r-- | src/mem/xbar.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/xbar.hh b/src/mem/xbar.hh index 79e9a5380..251ad62cb 100644 --- a/src/mem/xbar.hh +++ b/src/mem/xbar.hh @@ -52,9 +52,9 @@ #define __MEM_XBAR_HH__ #include <deque> +#include <unordered_map> #include "base/addr_range_map.hh" -#include "base/hashmap.hh" #include "base/types.hh" #include "mem/mem_object.hh" #include "mem/qport.hh" @@ -114,7 +114,7 @@ class BaseXBar : public MemObject * * @return 1 if busy or waiting to retry, or 0 if idle */ - DrainState drain() M5_ATTR_OVERRIDE; + DrainState drain() override; /** * Get the crossbar layer's name @@ -327,7 +327,7 @@ class BaseXBar : public MemObject * the underlying Request pointer inside the Packet stays * constant. */ - m5::unordered_map<RequestPtr, PortID> routeTo; + std::unordered_map<RequestPtr, PortID> routeTo; /** all contigous ranges seen by this crossbar */ AddrRangeList xbarRanges; |