44c44,45
< #include "base/hashmap.hh"
---
> #include <unordered_map>
>
138c139
< m5::hash_map<uint32_t, BaseGen*> states;
---
> std::unordered_map<uint32_t, BaseGen*> states;
201c202
< DrainState drain() M5_ATTR_OVERRIDE;
---
> DrainState drain() override;
203,204c204,205
< 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;