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.
This commit is contained in:
committed by
Michael Lutz
parent
31260e6625
commit
af7d9020a1
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user