From 2ac04c11accb46f92cf7f2b7abe40404dbf8c5d6 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Mon, 12 Oct 2015 04:08:01 -0400 Subject: 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). --- src/dev/disk_image.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dev/disk_image.hh') 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); -- cgit v1.2.3