summaryrefslogtreecommitdiff
path: root/src/dev
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2016-08-16 10:59:15 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2016-08-16 10:59:15 +0100
commitd80a613990935dd144a5665a875f91725ee81f78 (patch)
treeae7604a5985971a9baf8ee908babe2e0d0a9e6fb /src/dev
parent2c05f5207d3c7d1a785bef79562edc02cd3f4bc1 (diff)
downloadgem5-d80a613990935dd144a5665a875f91725ee81f78.tar.xz
dev: Revert 0a316996de76 [dev, sim: Added missing override...]
This changeset reverts the changset "dev, sim: Added missing override keywords to fix CLANG compilation (OSX)" which was incorrectly rebased. Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/dev')
-rw-r--r--src/dev/storage/disk_image.hh6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/dev/storage/disk_image.hh b/src/dev/storage/disk_image.hh
index 6c58129bd..0f86aab35 100644
--- a/src/dev/storage/disk_image.hh
+++ b/src/dev/storage/disk_image.hh
@@ -89,10 +89,8 @@ class RawDiskImage : public DiskImage
std::streampos size() const override;
- virtual std::streampos read(uint8_t *data, std::streampos offset)
- const override;
- virtual std::streampos write(const uint8_t *data, std::streampos offset)
- override;
+ std::streampos read(uint8_t *data, std::streampos offset) const override;
+ std::streampos write(const uint8_t *data, std::streampos offset) override;
};
/**