diff options
author | Max Horn | 2005-06-21 16:45:18 +0000 |
---|---|---|
committer | Max Horn | 2005-06-21 16:45:18 +0000 |
commit | 90036d6d8ab92ccacf11aa975709182452f6eb20 (patch) | |
tree | c239c4bd2615951a0d86f7da7bb536aeacf1a9ea | |
parent | d38a41e5327f1a975160fa3fe9cd810149b1fbc9 (diff) | |
download | scummvm-rg350-90036d6d8ab92ccacf11aa975709182452f6eb20.tar.gz scummvm-rg350-90036d6d8ab92ccacf11aa975709182452f6eb20.tar.bz2 scummvm-rg350-90036d6d8ab92ccacf11aa975709182452f6eb20.zip |
Patch #1224631 (fix gcc4 virtual functions non-virtual destructor warnings)
svn-id: r18424
-rw-r--r-- | scumm/instrument.h | 1 | ||||
-rw-r--r-- | scumm/player_v2a.cpp | 2 | ||||
-rw-r--r-- | sky/music/musicbase.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/scumm/instrument.h b/scumm/instrument.h index cd2cfacbc6..9e0c397b55 100644 --- a/scumm/instrument.h +++ b/scumm/instrument.h @@ -34,6 +34,7 @@ class Instrument; class InstrumentInternal { public: + virtual ~InstrumentInternal() {}; virtual void saveOrLoad (Serializer *s) = 0; virtual void send (MidiChannel *mc) = 0; virtual void copy_to (Instrument *dest) = 0; diff --git a/scumm/player_v2a.cpp b/scumm/player_v2a.cpp index 4381c5bcc7..f913295e8e 100644 --- a/scumm/player_v2a.cpp +++ b/scumm/player_v2a.cpp @@ -62,7 +62,7 @@ static uint32 GetCRC (byte *data, int len) class V2A_Sound { public: V2A_Sound() : _id(0), _mod(NULL) { } - + virtual ~V2A_Sound() {}; virtual void start(Player_MOD *mod, int id, const byte *data) = 0; virtual bool update() = 0; virtual void stop() = 0; diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h index 40785c7cfd..59ba5ec7cd 100644 --- a/sky/music/musicbase.h +++ b/sky/music/musicbase.h @@ -39,6 +39,7 @@ typedef struct { class ChannelBase { public: + virtual ~ChannelBase() {}; virtual void stopNote(void) = 0; virtual uint8 process(uint16 aktTime) = 0; virtual void updateVolume(uint16 pVolume) = 0; |