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/dev/disk_image.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/dev/disk_image.hh')
| -rw-r--r-- | src/dev/disk_image.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dev/disk_image.hh b/src/dev/disk_image.hh index 25483eed5..01e32440d 100644 --- a/src/dev/disk_image.hh +++ b/src/dev/disk_image.hh @@ -36,8 +36,8 @@ #define __DISK_IMAGE_HH__ #include <fstream> +#include <unordered_map> -#include "base/hashmap.hh" #include "params/CowDiskImage.hh" #include "params/DiskImage.hh" #include "params/RawDiskImage.hh" @@ -111,7 +111,7 @@ class CowDiskImage : public DiskImage struct Sector { uint8_t data[SectorSize]; }; - typedef m5::hash_map<uint64_t, Sector *> SectorTable; + typedef std::unordered_map<uint64_t, Sector *> SectorTable; protected: std::string filename; @@ -129,8 +129,8 @@ class CowDiskImage : public DiskImage void save(const std::string &file) const; void writeback(); - 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; virtual std::streampos size() const; |