summaryrefslogtreecommitdiff
path: root/src/music/os2_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/os2_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/os2_m.h')
-rw-r--r--src/music/os2_m.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/music/os2_m.h b/src/music/os2_m.h
index ac7cd0319..e320946ed 100644
--- a/src/music/os2_m.h
+++ b/src/music/os2_m.h
@@ -17,25 +17,25 @@
/** OS/2's music player. */
class MusicDriver_OS2 : public MusicDriver {
public:
- /* virtual */ const char *Start(const char * const *param);
+ const char *Start(const char * const *param) override;
- /* 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();
+ bool IsSongPlaying() override;
- /* virtual */ void SetVolume(byte vol);
- /* virtual */ const char *GetName() const { return "os2"; }
+ void SetVolume(byte vol) override;
+ const char *GetName() const override { return "os2"; }
};
/** Factory for OS/2's music player. */
class FMusicDriver_OS2 : public DriverFactoryBase {
public:
FMusicDriver_OS2() : DriverFactoryBase(Driver::DT_MUSIC, 10, "os2", "OS/2 Music Driver") {}
- /* virtual */ Driver *CreateInstance() const { return new MusicDriver_OS2(); }
+ Driver *CreateInstance() const override { return new MusicDriver_OS2(); }
};
#endif /* MUSIC_OS2_H */