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

16
src/music/allegro_m.h
View File

@@ -17,18 +17,18 @@
/** Allegro's music player. */
class MusicDriver_Allegro : 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 "allegro"; }
void SetVolume(byte vol) override;
const char *GetName() const override { return "allegro"; }
};
/** Factory for allegro's music player. */
@@ -43,7 +43,7 @@ public:
static const int PRIORITY = 2;
#endif
FMusicDriver_Allegro() : DriverFactoryBase(Driver::DT_MUSIC, PRIORITY, "allegro", "Allegro MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_Allegro(); }
Driver *CreateInstance() const override { return new MusicDriver_Allegro(); }
};
#endif /* MUSIC_ALLEGRO_H */