diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:08:01 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:08:01 -0400 |
commit | 2ac04c11accb46f92cf7f2b7abe40404dbf8c5d6 (patch) | |
tree | 368b579a0b45840a5248fca568f89a8ea7ca9d49 /src/dev/disk_image.hh | |
parent | 22c04190c607b9360d9a23548f8a54e83cf0e74a (diff) | |
download | gem5-2ac04c11accb46f92cf7f2b7abe40404dbf8c5d6.tar.xz |
misc: Add explicit overrides and fix other clang >= 3.5 issues
This patch adds explicit overrides as this is now required when using
"-Wall" with clang >= 3.5, the latter now part of the most recent
XCode. The patch consequently removes "virtual" for those methods
where "override" is added. The latter should be enough of an
indication.
As part of this patch, a few minor issues that clang >= 3.5 complains
about are also resolved (unused methods and variables).
Diffstat (limited to 'src/dev/disk_image.hh')
-rw-r--r-- | src/dev/disk_image.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/disk_image.hh b/src/dev/disk_image.hh index 01e32440d..fa25fc770 100644 --- a/src/dev/disk_image.hh +++ b/src/dev/disk_image.hh @@ -132,10 +132,10 @@ class CowDiskImage : public DiskImage void serialize(CheckpointOut &cp) const override; void unserialize(CheckpointIn &cp) override; - virtual std::streampos size() const; + std::streampos size() const override; - virtual std::streampos read(uint8_t *data, std::streampos offset) const; - virtual std::streampos write(const uint8_t *data, std::streampos offset); + std::streampos read(uint8_t *data, std::streampos offset) const override; + std::streampos write(const uint8_t *data, std::streampos offset) override; }; void SafeRead(std::ifstream &stream, void *data, int count); |