changeset 7e7157941d70 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7e7157941d70
description:
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 <[email protected]>
diffstat:
src/dev/storage/disk_image.hh | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diffs (16 lines):
diff -r 985d9b9a68bf -r 7e7157941d70 src/dev/storage/disk_image.hh
--- a/src/dev/storage/disk_image.hh Mon Aug 15 12:00:37 2016 +0100
+++ b/src/dev/storage/disk_image.hh Tue Aug 16 10:59:15 2016 +0100
@@ -89,10 +89,8 @@
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;
};
/**
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
