[Scummvm-devel] [tbm at cyrius.com: Bug#420993: FTBFS with GCC 4.3: error: extra '; ']

David Weinehall tao at debian.org
Wed Apr 25 19:45:00 CEST 2007


Forwarded bug report from Debian, including patch.


Regards. David

----- Forwarded message from Martin Michlmayr <tbm at cyrius.com> -----

From: Martin Michlmayr <tbm at cyrius.com>
Date: Wed, 25 Apr 2007 19:31:33 +0200
To: submit at bugs.debian.org
Reply-To: Martin Michlmayr <tbm at cyrius.com>, 420993 at bugs.debian.org
Delivered-To: tao at acc.umu.se
Delivered-To: submit at bugs.debian.org
Subject: Bug#420993: FTBFS with GCC 4.3: error: extra ';'

Package: scummvm
Version: 0.9.1-1
Usertags: ftbfs-gcc-4.3
Tags: patch

Your package fails to build with GCC 4.3.  Version 4.3 has not been
released yet but I'm building with a snapshot in order to find errors
and give people an advance warning.

You can reproduce this problem with gcc-snapshot (20070422-1 or higher)
from unstable. (Currently not available for i386, but for amd64, powerpc
and ia64.  I hope to have i386 binaries in the archive in the near
future.)

> Automatic build of scummvm_0.9.1-1 on em64t by sbuild/amd64 0.53
...
> ./common/str.h:75: warning: conversion to 'char' from 'int' may alter its value
> In file included from ./common/system.h:29,
>                  from ./backends/sdl/sdl-common.h:31,
>                  from backends/sdl/events.cpp:24:
> ./common/rect.h: At global scope:
> ./common/rect.h:39: error: extra ';'
> ./common/rect.h:40: error: extra ';'
> ./common/rect.h:41: error: extra ';'
> ./common/rect.h:42: error: extra ';'
> ./common/rect.h:43: error: extra ';'
> ./common/rect.h:44: error: extra ';'
> ./common/rect.h: In member function 'int16 Common::Rect::width() const':

--- backends/sdl/sdl-common.h~	2007-04-25 16:35:04.000000000 +0000
+++ backends/sdl/sdl-common.h	2007-04-25 16:35:10.000000000 +0000
@@ -106,7 +106,7 @@
 	void disableCursorPalette(bool disable) {
 		_cursorPaletteDisabled = disable;
 		blitCursor();
-	};
+	}
 
 	// Shaking is used in SCUMM. Set current shake position.
 	void setShakePos(int shake_pos);
--- gui/theme.h~	2007-04-25 16:37:09.000000000 +0000
+++ gui/theme.h	2007-04-25 16:37:12.000000000 +0000
@@ -183,7 +183,7 @@
 			break;
 		};
 		return Graphics::kTextAlignCenter;
-	};
+	}
 	
 	TextAlign convertAligment(Graphics::TextAlignment align) const {
 		switch (align) {
--- engines/sky/music/musicbase.h~	2007-04-25 16:50:03.000000000 +0000
+++ engines/sky/music/musicbase.h	2007-04-25 16:50:19.000000000 +0000
@@ -40,7 +40,7 @@
 
 class ChannelBase {
 public:
-	virtual ~ChannelBase() {};
+	virtual ~ChannelBase() {}
 	virtual void stopNote(void) = 0;
 	virtual uint8 process(uint16 aktTime) = 0;
 	virtual void updateVolume(uint16 pVolume) = 0;
@@ -53,11 +53,11 @@
 	MusicBase(Disk *pDisk);
 	virtual ~MusicBase(void);
 	void loadSection(uint8 pSection);
-	void startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; }; // 4
+	void startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; } // 4
 	void stopMusic();                                                            // 7
 	bool musicIsPlaying(void);
-	uint8 giveVolume(void) { return (uint8)_musicVolume; };
-	uint8 giveCurrentMusic(void) { return _currentMusic; };
+	uint8 giveVolume(void) { return (uint8)_musicVolume; }
+	uint8 giveCurrentMusic(void) { return _currentMusic; }
 	void setVolume(uint16 param);
 
 protected:
--- engines/sky/screen.h~	2007-04-25 16:49:45.000000000 +0000
+++ engines/sky/screen.h	2007-04-25 16:49:54.000000000 +0000
@@ -71,14 +71,14 @@
 	void startSequence(uint16 fileNum);
 	void startSequenceItem(uint16 itemNum);
 	void stopSequence(void);
-	bool sequenceRunning(void) { return _seqInfo.running; };
+	bool sequenceRunning(void) { return _seqInfo.running; }
 	void waitForSequence(void);
-	uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; };
-	uint8 *giveCurrent(void) { return _currentScreen; };
+	uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; }
+	uint8 *giveCurrent(void) { return _currentScreen; }
 	void halvePalette(void);
 
 	//- regular screen.asm routines
-	void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); };
+	void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); }
 	void fnFadeUp(uint32 palNum, uint32 scroll);
 	void fnFadeDown(uint32 scroll);
 	void fnDrawScreen(uint32 palette, uint32 scroll);
--- engines/sky/mouse.h~	2007-04-25 16:50:34.000000000 +0000
+++ engines/sky/mouse.h	2007-04-25 16:51:38.000000000 +0000
@@ -52,14 +52,14 @@
 	void restoreMouseData(uint16 frameNum);
 	void drawNewMouse(void);
 	void spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY);
-	void useLogicInstance(Logic *skyLogic) { _skyLogic = skyLogic; };
+	void useLogicInstance(Logic *skyLogic) { _skyLogic = skyLogic; }
 	void buttonPressed(uint8 button);
 	void waitMouseNotPressed(int minDelay = 0);
-	uint16 giveMouseX(void) { return _mouseX; };
-	uint16 giveMouseY(void) { return _mouseY; };
-	uint16 giveCurrentMouseType(void) { return _currentCursor; };
+	uint16 giveMouseX(void) { return _mouseX; }
+	uint16 giveMouseY(void) { return _mouseY; }
+	uint16 giveCurrentMouseType(void) { return _currentCursor; }
 	bool wasClicked(void);
-	void logicClick(void) { _logicClick = true; };
+	void logicClick(void) { _logicClick = true; }
 	void resetCursor();
 
 protected:
--- engines/sky/control.h~	2007-04-25 16:51:00.000000000 +0000
+++ engines/sky/control.h	2007-04-25 16:51:08.000000000 +0000
@@ -133,10 +133,10 @@
 class ConResource {
 public:
 	ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
-	virtual ~ConResource(void) {};
-	void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; };
-	void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; };
-	void setXY(uint16 x, uint16 y) { _x = x; _y = y; };
+	virtual ~ConResource(void) {}
+	void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; }
+	void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; }
+	void setXY(uint16 x, uint16 y) { _x = x; _y = y; }
 	bool isMouseOver(uint32 mouseX, uint32 mouseY);
 	virtual void drawToScreen(bool doMask);
 
--- engines/sky/disk.h~	2007-04-25 16:51:15.000000000 +0000
+++ engines/sky/disk.h	2007-04-25 16:51:22.000000000 +0000
@@ -54,7 +54,7 @@
 	void fnCacheChip(uint16 *fList);
 	void fnCacheFiles(void);
 	void fnFlushBuffers(void);
-	uint32 *giveLoadedFilesList(void) { return _loadedFilesList; };
+	uint32 *giveLoadedFilesList(void) { return _loadedFilesList; }
 	void refreshFilesList(uint32 *list);
 
 protected:
--- engines/sky/sound.h~	2007-04-25 16:51:48.000000000 +0000
+++ engines/sky/sound.h	2007-04-25 16:51:51.000000000 +0000
@@ -70,7 +70,7 @@
 	void playSound(uint16 sound, uint16 volume, uint8 channel);
 	void fnStartFx(uint32 sound, uint8 channel);
 	bool startSpeech(uint16 textNum);
-	bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); };
+	bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); }
 	void fnPauseFx(void);
 	void fnUnPauseFx(void);
 	void fnStopFx(void);
--- engines/sky/logic.h~	2007-04-25 16:52:03.000000000 +0000
+++ engines/sky/logic.h	2007-04-25 16:52:10.000000000 +0000
@@ -143,7 +143,7 @@
 		Sound *skySound);
 	~Logic(void);
 	void engine();
-	void useControlInstance(Control *control) { _skyControl = control; };
+	void useControlInstance(Control *control) { _skyControl = control; }
 
 	uint16 mouseScript(uint32 scrNum, Compact *scriptComp);
 
--- engines/sword1/sound.h~	2007-04-25 16:52:55.000000000 +0000
+++ engines/sword1/sound.h	2007-04-25 16:53:01.000000000 +0000
@@ -72,10 +72,10 @@
 public:
 	Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan);
 	~Sound(void);
-	void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; };
-	void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; };
-	void giveSpeechVol(uint8 *volL, uint8 *volR) { *volL = _speechVolL; *volR = _speechVolR; };
-	void giveSfxVol(uint8 *volL, uint8 *volR) { *volL = _sfxVolL; *volR = _sfxVolR; };
+	void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; }
+	void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; }
+	void giveSpeechVol(uint8 *volL, uint8 *volR) { *volL = _speechVolL; *volR = _speechVolR; }
+	void giveSfxVol(uint8 *volL, uint8 *volR) { *volL = _sfxVolL; *volR = _sfxVolR; }
 	void newScreen(uint32 screen);
 	void quitScreen(void);
 	void closeCowSystem(void);
--- engines/sword1/credits.h~	2007-04-25 16:53:08.000000000 +0000
+++ engines/sword1/credits.h	2007-04-25 16:53:11.000000000 +0000
@@ -40,7 +40,7 @@
 	uint8 *fetchFile(uint32 fileId, uint32 *size = NULL);
 	uint8 *decompressFile(uint32 fileId);
 	void enterPath(uint32 id);
-	void backToRoot(void) { _bufPos = _buf; };
+	void backToRoot(void) { _bufPos = _buf; }
 private:
 	uint8 *_bufPos;
 	uint8 *_buf;
--- engines/sword1/music.h~	2007-04-25 16:53:22.000000000 +0000
+++ engines/sword1/music.h	2007-04-25 16:53:30.000000000 +0000
@@ -49,9 +49,9 @@
 	WaveAudioStream(Common::File *source, uint32 pSize);
 	virtual ~WaveAudioStream();
 	virtual int readBuffer(int16 *buffer, const int numSamples);
-	virtual bool isStereo(void) const { return _isStereo; };
+	virtual bool isStereo(void) const { return _isStereo; }
 	virtual bool endOfData(void) const;
-	virtual int getRate(void) const { return _rate; };
+	virtual int getRate(void) const { return _rate; }
 private:
 	Common::File	*_sourceFile;
 	uint8	*_sampleBuf;
--- engines/sword2/screen.cpp~	2007-04-25 16:54:57.000000000 +0000
+++ engines/sword2/screen.cpp	2007-04-25 16:55:00.000000000 +0000
@@ -804,7 +804,7 @@
 	CreditsLine() {
 		str = NULL;
 		sprite = NULL;
-	};
+	}
 
 	~CreditsLine() {
 		free(str);
--- engines/scumm/he/resource_he.h~	2007-04-25 16:38:12.000000000 +0000
+++ engines/scumm/he/resource_he.h	2007-04-25 16:38:24.000000000 +0000
@@ -124,10 +124,10 @@
 
 	void setCursor(int id);
 
-	virtual int extractResource(int id, byte **buf) { return 0; };
+	virtual int extractResource(int id, byte **buf) { return 0; }
 	virtual int convertIcons(byte *data, int datasize, byte **cursor, int *w, int *h,
 							 int *hotspot_x, int *hotspot_y, int *keycolor,
-							 byte **palette, int *palSize) { return 0; };
+							 byte **palette, int *palSize) { return 0; }
 
 	enum {
 		MAX_CACHED_CURSORS = 10
@@ -160,7 +160,7 @@
 class Win32ResExtractor : public ResExtractor {
  public:
 	Win32ResExtractor(ScummEngine_v70he *scumm);
-	~Win32ResExtractor() {};
+	~Win32ResExtractor() {}
 	int extractResource(int id, byte **data);
 	void setCursor(int id);
 	int convertIcons(byte *data, int datasize, byte **cursor, int *w, int *h,
--- engines/scumm/he/logic_he.h~	2007-04-25 16:40:09.000000000 +0000
+++ engines/scumm/he/logic_he.h	2007-04-25 16:40:26.000000000 +0000
@@ -42,11 +42,11 @@
 	int getFromArray(int arg0, int idx2, int idx1);
 	void putInArray(int arg0, int idx2, int idx1, int val);
 
-	void beforeBootScript(void) {};
-	void initOnce() {};
-	void startOfFrame() {};
-	void endOfFrame() {};
-	void processKeyStroke(int keyPressed) {};
+	void beforeBootScript(void) {}
+	void initOnce() {}
+	void startOfFrame() {}
+	void endOfFrame() {}
+	void processKeyStroke(int keyPressed) {}
 
 	virtual int versionID();
 	virtual int32 dispatch(int op, int numArgs, int32 *args);
--- engines/scumm/smush/chunk.h~	2007-04-25 16:40:33.000000000 +0000
+++ engines/scumm/smush/chunk.h	2007-04-25 16:40:37.000000000 +0000
@@ -32,7 +32,7 @@
 
 class Chunk {
 public:
-	virtual ~Chunk() {};
+	virtual ~Chunk() {}
 	enum seek_type { seek_start, seek_end, seek_cur };
 	typedef uint32 type;
 	static const char *ChunkString(type t);
--- engines/scumm/smush/channel.h~	2007-04-25 16:44:41.000000000 +0000
+++ engines/scumm/smush/channel.h	2007-04-25 16:45:22.000000000 +0000
@@ -33,7 +33,7 @@
 class SmushChannel {
 public:
 
-	virtual ~SmushChannel() {};
+	virtual ~SmushChannel() {}
 	virtual bool appendData(Chunk &b, int32 size) = 0;
 	virtual bool setParameters(int32, int32, int32, int32, int32) = 0;
 	virtual bool checkParameters(int32, int32, int32, int32, int32) = 0;
@@ -80,7 +80,7 @@
 	bool appendData(Chunk &b, int32 size);
 	int32 availableSoundData() const;
 	void getSoundData(int16 *sound_buffer, int32 size);
-	void getSoundData(int8 *sound_buffer, int32 size) { error("8bit request for SAUD channel should never happen"); };
+	void getSoundData(int8 *sound_buffer, int32 size) { error("8bit request for SAUD channel should never happen"); }
 	int32 getRate() { return _frequency; }
 	bool getParameters(int32 &rate, bool &stereo, bool &is_16bit, int32 &vol, int32 &pan) {
 		rate = _frequency;
@@ -89,8 +89,8 @@
 		vol = _volume;
 		pan = _pan;
 		return true;
-	};
-	virtual int32 getTrackIdentifier() const { return _track; };
+	}
+	virtual int32 getTrackIdentifier() const { return _track; }
 };
 
 class ImuseChannel : public SmushChannel {
@@ -139,8 +139,8 @@
 		vol = _volume;
 		pan = _pan;
 		return true;
-	};
-	virtual int32 getTrackIdentifier() const { return _track; };
+	}
+	virtual int32 getTrackIdentifier() const { return _track; }
 };
 
 } // End of namespace Scumm
--- engines/scumm/smush/smush_player.cpp~	2007-04-25 16:45:37.000000000 +0000
+++ engines/scumm/smush/smush_player.cpp	2007-04-25 16:45:40.000000000 +0000
@@ -80,7 +80,7 @@
 	StringResource() :
 		_nbStrings(0),
 		_lastId(-1) {
-	};
+	}
 	~StringResource() {
 		for (int32 i = 0; i < _nbStrings; i++) {
 			delete []_strings[i].string;
--- engines/scumm/player_v2a.cpp~	2007-04-25 16:41:57.000000000 +0000
+++ engines/scumm/player_v2a.cpp	2007-04-25 16:42:01.000000000 +0000
@@ -63,7 +63,7 @@
 class V2A_Sound {
 public:
 	V2A_Sound() : _id(0), _mod(NULL) { }
-	virtual ~V2A_Sound() {};
+	virtual ~V2A_Sound() {}
 	virtual void start(Player_MOD *mod, int id, const byte *data) = 0;
 	virtual bool update() = 0;
 	virtual void stop() = 0;
--- engines/simon/sound.cpp~	2007-04-25 16:48:00.000000000 +0000
+++ engines/simon/sound.cpp	2007-04-25 16:49:15.000000000 +0000
@@ -59,19 +59,19 @@
 
 class WavSound : public BaseSound {
 public:
-	WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
-	WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {};
+	WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {}
+	WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {}
 	void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
 };
 
 class VocSound : public BaseSound {
 public:
-	VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
+	VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {}
 	void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
 };
 class RawSound : public BaseSound {
 public:
-	RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
+	RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {}
 	void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
 };
 
@@ -173,7 +173,7 @@
 #ifdef USE_MAD
 class MP3Sound : public BaseSound {
 public:
-	MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+	MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}
 	void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
 };
 
@@ -197,7 +197,7 @@
 #ifdef USE_VORBIS
 class VorbisSound : public BaseSound {
 public:
-	VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+	VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}
 	void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
 };
 
@@ -221,7 +221,7 @@
 #ifdef USE_FLAC
 class FlacSound : public BaseSound {
 public:
-	FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+	FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}
 	void playSound(uint sound, Audio::SoundHandle *handle, byte flags);
 };
 
--- engines/gob/video.h~	2007-04-25 16:59:35.000000000 +0000
+++ engines/gob/video.h	2007-04-25 16:59:46.000000000 +0000
@@ -92,7 +92,7 @@
 	bool _extraMode;
 
 	Video(class GobEngine *vm);
-	virtual ~Video() {};
+	virtual ~Video() {}
 	int32 getRectSize(int16 width, int16 height, int16 flag, int16 mode);
 	void freeSurfDesc(SurfaceDesc * surfDesc);
 	int16 clampValue(int16 val, int16 max);
@@ -139,7 +139,7 @@
 			int16 x, int16 y, int16 transp, SurfaceDesc * destDesc);
 
 	Video_v1(GobEngine *vm);
-	virtual ~Video_v1() {};
+	virtual ~Video_v1() {}
 };
 
 class Video_v2 : public Video_v1 {
@@ -152,7 +152,7 @@
 			int16 x, int16 y, int16 transp, SurfaceDesc * destDesc);
 
 	Video_v2(GobEngine *vm);
-	virtual ~Video_v2() {};
+	virtual ~Video_v2() {}
 };
 
 class VideoDriver {
--- engines/gob/game.h~	2007-04-25 16:59:54.000000000 +0000
+++ engines/gob/game.h	2007-04-25 17:00:05.000000000 +0000
@@ -292,7 +292,7 @@
 	virtual void prepareStart(void);
 
 	Game_v1(GobEngine *vm);
-	virtual ~Game_v1() {};
+	virtual ~Game_v1() {}
 
 protected:
 	virtual void pushCollisions(char all);
@@ -312,7 +312,7 @@
 	virtual void prepareStart(void);
 
 	Game_v2(GobEngine *vm);
-	virtual ~Game_v2() {};
+	virtual ~Game_v2() {}
 
 protected:
 	struct CollLast {
--- engines/gob/inter.h~	2007-04-25 17:00:28.000000000 +0000
+++ engines/gob/inter.h	2007-04-25 17:00:41.000000000 +0000
@@ -65,7 +65,7 @@
 	virtual void animPalette(void) = 0;
 
 	Inter(GobEngine *vm);
-	virtual ~Inter() {};
+	virtual ~Inter() {}
 
 protected:
 	GobEngine *_vm;
@@ -83,7 +83,7 @@
 class Inter_v1 : public Inter {
 public:
 	Inter_v1(GobEngine *vm);
-	virtual ~Inter_v1() {};
+	virtual ~Inter_v1() {}
 	virtual int16 loadSound(int16 slot);
 	virtual void storeMouse(void);
 	virtual void animPalette(void);
@@ -275,7 +275,7 @@
 class Inter_v2 : public Inter_v1 {
 public:
 	Inter_v2(GobEngine *vm);
-	virtual ~Inter_v2() {};
+	virtual ~Inter_v2() {}
 	virtual int16 loadSound(int16 search);
 	virtual void storeMouse(void);
 	virtual void animPalette(void);
--- engines/gob/mult.h~	2007-04-25 17:00:50.000000000 +0000
+++ engines/gob/mult.h	2007-04-25 17:00:56.000000000 +0000
@@ -247,7 +247,7 @@
 	virtual void freeMultKeys(void) = 0;
 
 	Mult(GobEngine *vm);
-	virtual ~Mult() {};
+	virtual ~Mult() {}
 
 protected:
 	Video::Color _fadePal[5][16];
@@ -265,7 +265,7 @@
 class Mult_v1 : public Mult {
 public:
 	Mult_v1(GobEngine *vm);
-	virtual ~Mult_v1() {};
+	virtual ~Mult_v1() {}
 
 	virtual void setMultData(uint16 multindex);
 	virtual void multSub(uint16 multindex);
--- engines/gob/scenery.h~	2007-04-25 17:01:05.000000000 +0000
+++ engines/gob/scenery.h	2007-04-25 17:01:13.000000000 +0000
@@ -134,7 +134,7 @@
 			int16 flags, int16 drawDeltaX, int16 drawDeltaY, char doDraw) = 0;
 
 	Scenery(GobEngine *vm);
-	virtual ~Scenery() {};
+	virtual ~Scenery() {}
 
 protected:
 	GobEngine *_vm;
@@ -146,7 +146,7 @@
 			int16 flags, int16 drawDeltaX, int16 drawDeltaY, char doDraw);
 
 	Scenery_v1(GobEngine *vm);
-	virtual ~Scenery_v1() {};
+	virtual ~Scenery_v1() {}
 };
 
 class Scenery_v2 : public Scenery_v1 {
@@ -155,7 +155,7 @@
 			int16 flags, int16 drawDeltaX, int16 drawDeltaY, char doDraw);
 
 	Scenery_v2(GobEngine *vm);
-	virtual ~Scenery_v2() {};
+	virtual ~Scenery_v2() {}
 };
 
 }				// End of namespace Gob
--- engines/gob/goblin.h~	2007-04-25 17:01:22.000000000 +0000
+++ engines/gob/goblin.h	2007-04-25 17:01:27.000000000 +0000
@@ -259,7 +259,7 @@
 			int16 nextAct, int16 framesCount);
 
 	Goblin_v1(GobEngine *vm);
-	virtual ~Goblin_v1() {};
+	virtual ~Goblin_v1() {}
 
 protected:
 	virtual void movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16 nextAct);
@@ -275,7 +275,7 @@
 			int16 nextAct, int16 framesCount);
 
 	Goblin_v2(GobEngine *vm);
-	virtual ~Goblin_v2() {};
+	virtual ~Goblin_v2() {}
 
 protected:
 	virtual void movePathFind(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16 nextAct);
--- engines/gob/draw.h~	2007-04-25 17:01:38.000000000 +0000
+++ engines/gob/draw.h	2007-04-25 17:01:47.000000000 +0000
@@ -137,7 +137,7 @@
 	virtual void spriteOperation(int16 operation) = 0;
 
 	Draw(GobEngine *vm);
-	virtual ~Draw() {};
+	virtual ~Draw() {}
 
 protected:
 	GobEngine *_vm;
@@ -150,7 +150,7 @@
 	virtual void spriteOperation(int16 operation);
 
 	Draw_v1(GobEngine *vm);
-	virtual ~Draw_v1() {};
+	virtual ~Draw_v1() {}
 };
 
 class Draw_v2 : public Draw_v1 {
@@ -160,7 +160,7 @@
 	virtual void spriteOperation(int16 operation);
 
 	Draw_v2(GobEngine *vm);
-	virtual ~Draw_v2() {};
+	virtual ~Draw_v2() {}
 };
 
 // Draw operations
--- engines/gob/parse.h~	2007-04-25 17:03:13.000000000 +0000
+++ engines/gob/parse.h	2007-04-25 17:03:28.000000000 +0000
@@ -35,7 +35,7 @@
 	virtual int16 parseExpr(char stopToken, byte *resultPtr) = 0;
 	
 	Parse(GobEngine *vm);
-	virtual ~Parse() {};
+	virtual ~Parse() {}
 
 protected:
 	enum PointerType {
@@ -55,7 +55,7 @@
 class Parse_v1 : public Parse {
 public:
 	Parse_v1(GobEngine *vm);
-	virtual ~Parse_v1() {};
+	virtual ~Parse_v1() {}
 
 	virtual int16 parseVarIndex(void);
 	virtual int16 parseValExpr(unsigned stopToken=99);
@@ -65,7 +65,7 @@
 class Parse_v2 : public Parse_v1 {
 public:
 	Parse_v2(GobEngine *vm);
-	virtual ~Parse_v2() {};
+	virtual ~Parse_v2() {}
 
 	virtual int16 parseVarIndex(void);
 	virtual int16 parseValExpr(unsigned stopToken=99);
--- engines/gob/music.h~	2007-04-25 17:03:34.000000000 +0000
+++ engines/gob/music.h	2007-04-25 17:03:54.000000000 +0000
@@ -105,15 +105,15 @@
 		OPLDestroy(_opl);
 	}
 
-	virtual void startPlay(void) {};
-	virtual void stopPlay(void) {};
-	virtual void playTrack(const char *trackname) {};
-	virtual void playBgMusic(void) {};
-	virtual bool loadMusic(const char *filename) { return true; };
-	virtual void loadFromMemory(byte *data) {};
-	virtual void unloadMusic(void) {};
+	virtual void startPlay(void) {}
+	virtual void stopPlay(void) {}
+	virtual void playTrack(const char *trackname) {}
+	virtual void playBgMusic(void) {}
+	virtual bool loadMusic(const char *filename) { return true; }
+	virtual void loadFromMemory(byte *data) {}
+	virtual void unloadMusic(void) {}
 
-	virtual ~Music_Dummy() {};
+	virtual ~Music_Dummy() {}
 };
 
 } // End of namespace Gob
--- engines/gob/init.h~	2007-04-25 17:04:17.000000000 +0000
+++ engines/gob/init.h	2007-04-25 17:04:26.000000000 +0000
@@ -35,7 +35,7 @@
 	virtual void soundVideo(int32 smallHeapSize, int16 flag) = 0;
 
 	Init(GobEngine *vm);
-	virtual ~Init() {};
+	virtual ~Init() {}
 
 protected:
 	Video::PalDesc *_palDesc;
@@ -50,7 +50,7 @@
 	virtual void soundVideo(int32 smallHeapSize, int16 flag);
 
 	Init_v1(GobEngine *vm);
-	virtual ~Init_v1() {};
+	virtual ~Init_v1() {}
 };
 
 class Init_v2 : public Init_v1 {
@@ -58,7 +58,7 @@
 	virtual void soundVideo(int32 smallHeapSize, int16 flag);
 
 	Init_v2(GobEngine *vm);
-	virtual ~Init_v2() {};
+	virtual ~Init_v2() {}
 };
 
 }				// End of namespace Gob
--- engines/gob/map.h~	2007-04-25 17:18:26.000000000 +0000
+++ engines/gob/map.h	2007-04-25 17:18:29.000000000 +0000
@@ -103,7 +103,7 @@
 	virtual void optimizePoints(Mult::Mult_Object *obj, int16 x, int16 y) = 0;
 
 	Map(GobEngine *vm);
-	virtual ~Map() {};
+	virtual ~Map() {}
 
 protected:
 	char *_avoDataPtr;
--- engines/queen/sound.h~	2007-04-25 16:55:43.000000000 +0000
+++ engines/queen/sound.h	2007-04-25 16:56:01.000000000 +0000
@@ -119,20 +119,20 @@
 
 class SilentSound : public Sound {
 public:
-	SilentSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+	SilentSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}
 	bool sfxPlay(const char *name, Audio::SoundHandle *soundHandle);
 };
 
 class SBSound : public Sound {
 public:
-	SBSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+	SBSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}
 	bool sfxPlay(const char *name, Audio::SoundHandle *soundHandle);
 };
 
 #ifdef USE_MAD
 class MP3Sound : public Sound {
 public:
-	MP3Sound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+	MP3Sound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}
 	bool sfxPlay(const char *name, Audio::SoundHandle *soundHandle);
 };
 #endif
@@ -140,7 +140,7 @@
 #ifdef USE_VORBIS
 class OGGSound : public Sound {
 public:
-	OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+	OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}
 	bool sfxPlay(const char *name, Audio::SoundHandle *soundHandle);
 };
 #endif
@@ -148,7 +148,7 @@
 #ifdef USE_FLAC
 class FLACSound : public Sound {
 public:
-	FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
+	FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}
 	bool sfxPlay(const char *name, Audio::SoundHandle *soundHandle);
 };
 #endif // #ifdef USE_FLAC
--- engines/queen/command.h~	2007-04-25 16:56:13.000000000 +0000
+++ engines/queen/command.h	2007-04-25 16:56:16.000000000 +0000
@@ -185,7 +185,7 @@
 	void lookForCurrentIcon(int16 cx, int16 cy);
 
 	//! returns true if the verb is an action verb
-	bool isVerbAction(Verb v) const { return (v >= VERB_PANEL_COMMAND_FIRST && v <= VERB_PANEL_COMMAND_LAST) || (v == VERB_WALK_TO); };
+	bool isVerbAction(Verb v) const { return (v >= VERB_PANEL_COMMAND_FIRST && v <= VERB_PANEL_COMMAND_LAST) || (v == VERB_WALK_TO); }
 
 	//! return true if the verb is an inventory item
 	bool isVerbInv(Verb v) const { return v >= VERB_INV_FIRST && v <= VERB_INV_LAST; }
--- common/system.h~	2007-04-25 16:35:17.000000000 +0000
+++ common/system.h	2007-04-25 16:35:29.000000000 +0000
@@ -325,14 +325,14 @@
 	 *       of the relevant methods simply do nothing.
 	 * @see endGFXTransaction
 	 */
-	virtual void beginGFXTransaction() {};
+	virtual void beginGFXTransaction() {}
 
 
 	/**
 	 * End (and thereby commit) the current GFX transaction.
 	 * @see beginGFXTransaction
 	 */
-	virtual void endGFXTransaction() {};
+	virtual void endGFXTransaction() {}
 
 
 	/**
@@ -630,7 +630,7 @@
 	 * @see setPalette
 	 * @see kFeatureCursorHasPalette
 	 */
-	virtual void setCursorPalette(const byte *colors, uint start, uint num) {};
+	virtual void setCursorPalette(const byte *colors, uint start, uint num) {}
 
 	/**
 	 * Disable or enable cursor palette.
@@ -642,7 +642,7 @@
 	 * @see setPalette
 	 * @see kFeatureCursorHasPalette
 	 */
-	virtual void disableCursorPalette(bool disable) {};
+	virtual void disableCursorPalette(bool disable) {}
 
 	//@}
 
--- common/rect.h~	2007-04-25 16:35:37.000000000 +0000
+++ common/rect.h	2007-04-25 16:35:55.000000000 +0000
@@ -36,12 +36,12 @@
 	int16 x;	//!< The horizontal part of the point
 	int16 y;	//!< The vertical part of the point
 
-	Point() : x(0), y(0) {};
-	Point(const Point &p) : x(p.x), y(p.y) {};
-	explicit Point(int16 x1, int16 y1) : x(x1), y(y1) {};
-	Point & operator=(const Point & p) { x = p.x; y = p.y; return *this; };
-	bool operator==(const Point & p) const { return x == p.x && y == p.y; };
-	bool operator!=(const Point & p) const { return x != p.x || y != p.y; };
+	Point() : x(0), y(0) {}
+	Point(const Point &p) : x(p.x), y(p.y) {}
+	explicit Point(int16 x1, int16 y1) : x(x1), y(y1) {}
+	Point & operator=(const Point & p) { x = p.x; y = p.y; return *this; }
+	bool operator==(const Point & p) const { return x == p.x && y == p.y; }
+	bool operator!=(const Point & p) const { return x != p.x || y != p.y; }
 };
 
 /*! 	@brief simple class for handling a rectangular zone.
--- sound/mixer.h~	2007-04-25 16:36:42.000000000 +0000
+++ sound/mixer.h	2007-04-25 16:36:45.000000000 +0000
@@ -119,7 +119,7 @@
 	 *
 	 * @return whether the mixer is ready and setup
 	 */
-	bool isReady() const { return _mixerReady; };
+	bool isReady() const { return _mixerReady; }
 
 
 
--- sound/adpcm.cpp~	2007-04-25 17:22:47.000000000 +0000
+++ sound/adpcm.cpp	2007-04-25 17:22:50.000000000 +0000
@@ -69,7 +69,7 @@
 
 public:
 	ADPCMInputStream(Common::SeekableReadStream *stream, uint32 size, typesADPCM type, int rate, int channels = 2, uint32 blockAlign = 0);
-	~ADPCMInputStream() {};
+	~ADPCMInputStream() {}
 
 	int readBuffer(int16 *buffer, const int numSamples);
 	int readBufferOKI(int16 *buffer, const int numSamples);
--- sound/audiostream.cpp~	2007-04-25 17:23:04.000000000 +0000
+++ sound/audiostream.cpp	2007-04-25 17:23:34.000000000 +0000
@@ -118,7 +118,7 @@
 	const int _rate;
 	const byte *_origPtr;
 
-	inline bool eosIntern() const	{ return _ptr >= _end; };
+	inline bool eosIntern() const	{ return _ptr >= _end; }
 public:
 	LinearMemoryStream(int rate, const byte *ptr, uint len, uint loopOffset, uint loopLen, bool autoFreeMemory)
 		: _ptr(ptr), _end(ptr+len), _loopPtr(0), _loopEnd(0), _rate(rate) {
@@ -234,7 +234,7 @@
 	bool _finalized;
 	const int _rate;
 
-	inline bool eosIntern() const { return _end == _pos; };
+	inline bool eosIntern() const { return _end == _pos; }
 public:
 	AppendableMemoryStream(int rate, uint bufferSize);
 	~AppendableMemoryStream();
--- sound/flac.cpp~	2007-04-25 17:23:48.000000000 +0000
+++ sound/flac.cpp	2007-04-25 17:23:51.000000000 +0000
@@ -63,7 +63,7 @@
 	bool endOfData() const { return endOfStream(); }
 
 	uint getChannels() const { return MIN(_streaminfo.channels, MAX_OUTPUT_CHANNELS); }
-	uint getBufferedSamples() const { return _preBuffer.bufFill; };
+	uint getBufferedSamples() const { return _preBuffer.bufFill; }
 
 	const FLAC__StreamMetadata_StreamInfo& getStreamInfo() const {return _streaminfo;}
 
--- graphics/font.h~	2007-04-25 16:36:19.000000000 +0000
+++ graphics/font.h	2007-04-25 16:36:27.000000000 +0000
@@ -81,7 +81,7 @@
 class ScummFont : public Font {
 public:
 	virtual int getFontHeight() const { return 8; }
-	virtual int getMaxCharWidth() const { return 8; };
+	virtual int getMaxCharWidth() const { return 8; }
 
 	virtual int getCharWidth(byte chr) const;
 	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
@@ -126,7 +126,7 @@
 	~NewFont();
 
 	virtual int getFontHeight() const { return desc.height; }
-	virtual int getMaxCharWidth() const { return desc.maxwidth; };
+	virtual int getMaxCharWidth() const { return desc.maxwidth; }
 
 	virtual int getCharWidth(byte chr) const;
 	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;

-- 
Martin Michlmayr
http://www.cyrius.com/

----- End forwarded message -----

-- 
 /) David Weinehall <tao at debian.org> /) Rime on my window           (\
//  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   //  Diamond-white roses of fire //
\)  http://www.acc.umu.se/~tao/    (/   Beautiful hoar-frost       (/




More information about the Scummvm-devel mailing list