From d80a613990935dd144a5665a875f91725ee81f78 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Tue, 16 Aug 2016 10:59:15 +0100 Subject: [PATCH] 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 --- src/dev/storage/disk_image.hh | 6 ++---- 1 file 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; }; /** -- 2.30.2