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/dma_device.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/dma_device.hh')
-rw-r--r-- | src/dev/dma_device.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dev/dma_device.hh b/src/dev/dma_device.hh index 273b21e2b..782fe4648 100644 --- a/src/dev/dma_device.hh +++ b/src/dev/dma_device.hh @@ -134,8 +134,8 @@ class DmaPort : public MasterPort, public Drainable protected: - bool recvTimingResp(PacketPtr pkt); - void recvReqRetry() ; + bool recvTimingResp(PacketPtr pkt) override; + void recvReqRetry() override; void queueDma(PacketPtr pkt); @@ -175,12 +175,12 @@ class DmaDevice : public PioDevice bool dmaPending() const { return dmaPort.dmaPending(); } - virtual void init(); + void init() override; unsigned int cacheBlockSize() const { return sys->cacheLineSize(); } - virtual BaseMasterPort &getMasterPort(const std::string &if_name, - PortID idx = InvalidPortID); + BaseMasterPort &getMasterPort(const std::string &if_name, + PortID idx = InvalidPortID) override; }; |