dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Use override specifer for overriding member declarations

Browse Source 
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.

Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
This commit is contained in:
Henry Wilson
2019-03-03 22:25:13 +00:00
committed by Michael Lutz
parent 31260e6625
commit af7d9020a1
85 changed files with 565 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_generic.cpp
View File

@@ -42,7 +42,7 @@ struct GenericScopeResolver : public ScopeResolver {
{
}
/* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
uint32 GetVariable(byte variable, uint32 parameter, bool *available) const override;
private:
bool ai_callback; ///< Callback comes from the AI.
@@ -55,7 +55,7 @@ struct GenericResolverObject : public ResolverObject {
GenericResolverObject(bool ai_callback, CallbackID callback = CBID_NO_CALLBACK);
/* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0)
ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0) override
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->generic_scope;
@@ -63,7 +63,7 @@ struct GenericResolverObject : public ResolverObject {
}
}
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
};
struct GenericCallback {