diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-03-03 22:25:13 +0000 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-03-24 16:10:04 +0100 |
| commit | af7d9020a15c1b1a14b3981ac73c70d2e58cc877 (patch) | |
| tree | 1dcff3e01382ea3a0a4733a4637659dbbfd4bad5 /src/newgrf_generic.cpp | |
| parent | 31260e66252fb4d0dda6f992520faeeb96929cfe (diff) | |
| download | openttd-af7d9020a15c1b1a14b3981ac73c70d2e58cc877.tar.xz | |
Codechange: Use override specifer for overriding member declarations
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.
Diffstat (limited to 'src/newgrf_generic.cpp')
| -rw-r--r-- | src/newgrf_generic.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp index eb2cbf08f..d29a03929 100644 --- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -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 { |