diff options
| author | Markus Wick <markus@selfnet.de> | 2015-07-06 12:36:37 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-07-06 12:36:37 +0200 |
| commit | b6ee8865409ecff5966542c464ef7870ac25a87b (patch) | |
| tree | c374160b6e2485f2737cc9b81db4de66c391c977 /Source/Core | |
| parent | 009148d40120bf322ac07fcd501f0ba25b0b0096 (diff) | |
| parent | c7193fcd419f206a20ad4616e72b7e14c0dfd297 (diff) | |
Merge pull request #2708 from lioncash/override
MMIO: Add missing override specifiers
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/MMIO.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp index 2e82db2656..1ee72b892f 100644 --- a/Source/Core/Core/HW/MMIO.cpp +++ b/Source/Core/Core/HW/MMIO.cpp @@ -43,7 +43,7 @@ public: virtual ~ConstantHandlingMethod() {} - virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const + void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override { v.VisitConstant(value_); } @@ -66,7 +66,8 @@ class NopHandlingMethod : public WriteHandlingMethod<T> public: NopHandlingMethod() {} virtual ~NopHandlingMethod() {} - virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const + + void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const override { v.VisitNop(); } @@ -91,12 +92,12 @@ public: virtual ~DirectHandlingMethod() {} - virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const + void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override { v.VisitDirect(addr_, mask_); } - virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const + void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const override { v.VisitDirect(addr_, mask_); } @@ -146,12 +147,12 @@ public: virtual ~ComplexHandlingMethod() {} - virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const + void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override { v.VisitComplex(&read_lambda_); } - virtual void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const + void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const override { v.VisitComplex(&write_lambda_); } @@ -300,17 +301,17 @@ void ReadHandler<T>::ResetMethod(ReadHandlingMethod<T>* method) { std::function<T(u32)> ret; - virtual void VisitConstant(T value) + void VisitConstant(T value) override { ret = [value](u32) { return value; }; } - virtual void VisitDirect(const T* addr, u32 mask) + void VisitDirect(const T* addr, u32 mask) override { ret = [addr, mask](u32) { return *addr & mask; }; } - virtual void VisitComplex(const std::function<T(u32)>* lambda) + void VisitComplex(const std::function<T(u32)>* lambda) override { ret = *lambda; } @@ -356,17 +357,17 @@ void WriteHandler<T>::ResetMethod(WriteHandlingMethod<T>* method) { std::function<void(u32, T)> ret; - virtual void VisitNop() + void VisitNop() override { ret = [](u32, T) {}; } - virtual void VisitDirect(T* ptr, u32 mask) + void VisitDirect(T* ptr, u32 mask) override { ret = [ptr, mask](u32, T val) { *ptr = val & mask; }; } - virtual void VisitComplex(const std::function<void(u32, T)>* lambda) + void VisitComplex(const std::function<void(u32, T)>* lambda) override { ret = *lambda; } |