[Scummvm-cvs-logs] CVS: scummvm/scumm player_v2a.cpp,2.29,2.30 instrument.h,2.16,2.17

Max Horn fingolfin at users.sourceforge.net
Tue Jun 21 10:58:10 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv324/scumm

Modified Files:
	player_v2a.cpp instrument.h 
Log Message:
Patch #1224631 (fix gcc4 virtual functions non-virtual destructor warnings)

Index: player_v2a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.cpp,v
retrieving revision 2.29
retrieving revision 2.30
diff -u -d -r2.29 -r2.30
--- player_v2a.cpp	7 Apr 2005 07:29:19 -0000	2.29
+++ player_v2a.cpp	21 Jun 2005 16:45:17 -0000	2.30
@@ -62,7 +62,7 @@
 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;

Index: instrument.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.h,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- instrument.h	14 Apr 2005 19:23:21 -0000	2.16
+++ instrument.h	21 Jun 2005 16:45:18 -0000	2.17
@@ -34,6 +34,7 @@
 
 class InstrumentInternal {
 public:
+	virtual ~InstrumentInternal() {};
 	virtual void saveOrLoad (Serializer *s) = 0;
 	virtual void send (MidiChannel *mc) = 0;
 	virtual void copy_to (Instrument *dest) = 0;





More information about the Scummvm-git-logs mailing list