Skip to content

Commit

Permalink
Merge pull request #2708 from lioncash/override
Browse files Browse the repository at this point in the history
MMIO: Add missing override specifiers
  • Loading branch information
degasus committed Jul 6, 2015
2 parents 009148d + c7193fc commit b6ee886
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions Source/Core/Core/HW/MMIO.cpp
Expand Up @@ -43,7 +43,7 @@ class ConstantHandlingMethod : public ReadHandlingMethod<T>

virtual ~ConstantHandlingMethod() {}

virtual void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const
void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
{
v.VisitConstant(value_);
}
Expand All @@ -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();
}
Expand All @@ -91,12 +92,12 @@ class DirectHandlingMethod : public ReadHandlingMethod<T>,

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_);
}
Expand Down Expand Up @@ -146,12 +147,12 @@ class ComplexHandlingMethod : public ReadHandlingMethod<T>,

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_);
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b6ee886

Please sign in to comment.