diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-08-16 10:59:15 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-08-16 10:59:15 +0100 |
| commit | d80a613990935dd144a5665a875f91725ee81f78 (patch) | |
| tree | ae7604a5985971a9baf8ee908babe2e0d0a9e6fb /src | |
| parent | 2c05f5207d3c7d1a785bef79562edc02cd3f4bc1 (diff) | |
| download | gem5-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')
| -rw-r--r-- | src/dev/storage/disk_image.hh | 6 |
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; }; /** |