summaryrefslogtreecommitdiff
path: root/src/music/null_m.h
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-03-03 22:25:13 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-24 16:10:04 +0100
commitaf7d9020a15c1b1a14b3981ac73c70d2e58cc877 (patch)
tree1dcff3e01382ea3a0a4733a4637659dbbfd4bad5 /src/music/null_m.h
parent31260e66252fb4d0dda6f992520faeeb96929cfe (diff)
downloadopenttd-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/music/null_m.h')
-rw-r--r--src/music/null_m.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/music/null_m.h b/src/music/null_m.h
index 51e1a0665..837eeb092 100644
--- a/src/music/null_m.h
+++ b/src/music/null_m.h
@@ -17,25 +17,25 @@
/** The music player that does nothing. */
class MusicDriver_Null : public MusicDriver {
public:
- /* virtual */ const char *Start(const char * const *param) { return NULL; }
+ const char *Start(const char * const *param) override { return NULL; }
- /* virtual */ void Stop() { }
+ void Stop() override { }
- /* virtual */ void PlaySong(const MusicSongInfo &song) { }
+ void PlaySong(const MusicSongInfo &song) override { }
- /* virtual */ void StopSong() { }
+ void StopSong() override { }
- /* virtual */ bool IsSongPlaying() { return true; }
+ bool IsSongPlaying() override { return true; }
- /* virtual */ void SetVolume(byte vol) { }
- /* virtual */ const char *GetName() const { return "null"; }
+ void SetVolume(byte vol) override { }
+ const char *GetName() const override { return "null"; }
};
/** Factory for the null music player. */
class FMusicDriver_Null : public DriverFactoryBase {
public:
FMusicDriver_Null() : DriverFactoryBase(Driver::DT_MUSIC, 1, "null", "Null Music Driver") {}
- /* virtual */ Driver *CreateInstance() const { return new MusicDriver_Null(); }
+ Driver *CreateInstance() const override { return new MusicDriver_Null(); }
};
#endif /* MUSIC_NULL_H */