dev: Revert 0a316996de76 [dev, sim: Added missing override...]
authorAndreas Sandberg <andreas.sandberg@arm.com>
Tue, 16 Aug 2016 09:59:15 +0000 (10:59 +0100)
committerAndreas Sandberg <andreas.sandberg@arm.com>
Tue, 16 Aug 2016 09:59:15 +0000 (10:59 +0100)
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>
src/dev/storage/disk_image.hh

index 6c58129bd054e0160bbdbc0b614415db1a4aa8b9..0f86aab35907730874c153207404a47a5498ba13 100644 (file)
@@ -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;
 };
 
 /**