- Fix some GCC 4.7.1 warnings.

SVN r3747 (trunk)

game-music-emu/gme/Dual_Resampler.cpp

@@ -62,10 +62,10 @@ void Dual_Resampler::play_frame_( Blip_Buffer& blip_buf, dsample_t* out )
 	assert( blip_buf.samples_avail() == pair_count );
 	
 	resampler.write( new_count );
-	
+
 	long count = resampler.read( sample_buf.begin(), sample_buf_size );
 	assert( count == (long) sample_buf_size );
-	
+
 	mix_samples( blip_buf, out );
 	blip_buf.remove_samples( pair_count );
 }

game-music-emu/gme/Gbs_Emu.h

@@ -41,7 +41,7 @@ public:
 	
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 

game-music-emu/gme/Gym_Emu.h

@@ -34,7 +34,7 @@ public:
 	
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 	enum { gym_rate = 60 }; 

game-music-emu/gme/Music_Emu.h

@@ -58,7 +58,7 @@ public:
 	void ignore_silence( bool disable = true );
 	
 	// Info for current track
-	Gme_File::track_info;
+	using Gme_File::track_info;
 	blargg_err_t track_info( track_info_t* out ) const;
 	
 // Sound customization

game-music-emu/gme/Nsf_Emu.h

@@ -44,7 +44,7 @@ public:
 	
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 

game-music-emu/gme/Nsfe_Emu.h

@@ -46,7 +46,7 @@ public:
 public:
 	// deprecated
 	struct header_t { char tag [4]; };
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 	void disable_playlist( bool = true ); // use clear_playlist()

game-music-emu/gme/Spc_Emu.h

@@ -47,7 +47,7 @@ public:
 	
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 	byte const* trailer() const; // use track_info()

game-music-emu/gme/Vgm_Emu.h

@@ -51,7 +51,7 @@ public:
 	
 public:
 	// deprecated
-	Music_Emu::load;
+	using Music_Emu::load;
 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
 			{ return load_remaining_( &h, sizeof h, in ); }
 	byte const* gd3_data( int* size_out = 0 ) const; // use track_info()

src/d_protocol.cpp

@@ -217,10 +217,10 @@ int PackUserCmd (const usercmd_t *ucmd, const usercmd_t *basis, BYTE **stream)
 	buttons_changed = ucmd->buttons ^ basis->buttons;
 	if (buttons_changed != 0)
 	{
-		BYTE bytes[4] = {  ucmd->buttons        & 0x7F,
-						  (ucmd->buttons >> 7)  & 0x7F,
-						  (ucmd->buttons >> 14) & 0x7F,
-						  (ucmd->buttons >> 21) & 0xFF };
+		BYTE bytes[4] = {  BYTE(ucmd->buttons        & 0x7F),
+						  BYTE((ucmd->buttons >> 7)  & 0x7F),
+						  BYTE((ucmd->buttons >> 14) & 0x7F),
+						  BYTE((ucmd->buttons >> 21) & 0xFF) };
 
 		flags |= UCMDF_BUTTONS;
 

src/g_game.cpp

@@ -2104,7 +2104,7 @@ void G_DoSaveGame (bool okForQuicksave, FString filename, const char *descriptio
 
 	if (level.time != 0 || level.maptime != 0)
 	{
-		DWORD time[2] = { BigLong(TICRATE), BigLong(level.time) };
+		DWORD time[2] = { DWORD(BigLong(TICRATE)), DWORD(BigLong(level.time)) };
 		M_AppendPNGChunk (stdfile, MAKE_ID('p','t','I','c'), (BYTE *)&time, 8);
 	}
 

src/m_png.cpp

@@ -384,19 +384,19 @@ PNGHandle *M_VerifyPNG (FILE *file)
 
 	if (fread (&data, 1, 8, file) != 8)
 	{
-		return false;
+		return NULL;
 	}
 	if (data[0] != MAKE_ID(137,'P','N','G') || data[1] != MAKE_ID(13,10,26,10))
 	{ // Does not have PNG signature
-		return false;
+		return NULL;
 	}
 	if (fread (&data, 1, 8, file) != 8)
 	{
-		return false;
+		return NULL;
 	}
 	if (data[1] != MAKE_ID('I','H','D','R'))
 	{ // IHDR must be the first chunk
-		return false;
+		return NULL;
 	}
 
 	// It looks like a PNG so far, so start creating a PNGHandle for it
@@ -451,7 +451,7 @@ PNGHandle *M_VerifyPNG (FILE *file)
 	}
 
 	delete png;
-	return false;
+	return NULL;
 }
 
 //==========================================================================

src/oplsynth/music_opldumper_mididevice.cpp

@@ -235,13 +235,13 @@ void DiskWriterIO::OPLwriteReg(int which, uint reg, uchar data)
 	{
 		if (reg != 0 && reg != 2 && (reg != 255 || data != 255))
 		{
-			BYTE cmd[2] = { data, reg };
+			BYTE cmd[2] = { data, BYTE(reg) };
 			fwrite(cmd, 1, 2, File);
 		}
 	}
 	else
 	{
-		BYTE cmd[3] = { 4, reg, data };
+		BYTE cmd[3] = { 4, BYTE(reg), data };
 		fwrite (cmd + (reg > 4), 1, 3 - (reg > 4), File);
 	}
 }
@@ -261,7 +261,7 @@ void DiskWriterIO :: SetChip(int chipnum)
 		CurChip = chipnum;
 		if (Format == FMT_RDOS)
 		{
-			BYTE switcher[2] = { chipnum + 1, 2 };
+			BYTE switcher[2] = { BYTE(chipnum + 1), 2 };
 			fwrite(switcher, 1, 2, File);
 		}
 		else
@@ -309,7 +309,7 @@ void DiskWriterIO::SetClockRate(double samples_per_tick)
 		}
 		else
 		{ // Change the clock rate in the middle of the song.
-			BYTE clock_change[4] = { 0, 2, clock_word & 255, clock_word >> 8 };
+			BYTE clock_change[4] = { 0, 2, BYTE(clock_word & 255), BYTE(clock_word >> 8) };
 			fwrite(clock_change, 1, 4, File);
 		}
 	}

src/resourcefiles/file_wad.cpp

@@ -154,7 +154,7 @@ inline bool FWadFile::IsMarker(int lump, const char *marker)
 struct Marker
 {
 	int markertype;
-	int index;
+	unsigned int index;
 };
 
 void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, namespace_t space, bool flathack)
@@ -168,13 +168,13 @@ void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, name
 	{
 		if (IsMarker(i, startmarker))
 		{
-			Marker m = {0, i };
+			Marker m = { 0, i };
 			markers.Push(m);
 			numstartmarkers++;
 		}
 		else if (IsMarker(i, endmarker))
 		{
-			Marker m = {1, i };
+			Marker m = { 1, i };
 			markers.Push(m);
 			numendmarkers++;
 		}
@@ -191,8 +191,8 @@ void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, name
 		{
 			// We have found no F_START but one or more F_END markers.
 			// mark all lumps before the last F_END marker as potential flats.
-			int end = markers[markers.Size()-1].index;
-			for(int i = 0; i < end; i++)
+			unsigned int end = markers[markers.Size()-1].index;
+			for(unsigned int i = 0; i < end; i++)
 			{
 				if (Lumps[i].LumpSize == 4096)
 				{

src/sdl/crashcatcher.c

@@ -14,7 +14,7 @@
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
-#else if defined (__APPLE__)
+#elif defined (__APPLE__)
 #include <signal.h>
 #endif
 

src/sound/music_dumb.cpp

@@ -532,7 +532,7 @@ DUMBFILE *dumb_read_allfile(dumbfile_mem_status *filestate, BYTE *start, FILE *f
 		if (fread(mem + lenhave, 1, lenfull - lenhave, file) != (size_t)(lenfull - lenhave))
 		{
 			delete[] mem;
-			return false;
+			return NULL;
 		}
 		filestate->ptr = mem;
 	}

src/textures/animations.cpp

@@ -465,7 +465,7 @@ void FTextureManager::ParseRangeAnim (FScanner &sc, FTextureID picnum, int usety
 void FTextureManager::ParsePicAnim (FScanner &sc, FTextureID picnum, int usetype, bool missing, TArray<FAnimDef::FAnimFrame> &frames)
 {
 	FTextureID framenum;
-	DWORD min, max;
+	DWORD min = 1, max = 1;
 
 	framenum = ParseFramenum (sc, picnum, usetype, missing);
 	ParseTime (sc, min, max);
@@ -536,6 +536,7 @@ void FTextureManager::ParseTime (FScanner &sc, DWORD &min, DWORD &max)
 	}
 	else
 	{
+		min = max = 1;
 		sc.ScriptError ("Must specify a duration for animation frame");
 	}
 }

src/textures/emptytexture.cpp

@@ -71,10 +71,10 @@ protected:
 FTexture *EmptyTexture_TryCreate(FileReader & file, int lumpnum)
 {
 	char check[8];
-	if (file.GetLength() != 8) return false;
+	if (file.GetLength() != 8) return NULL;
 	file.Seek(0, SEEK_SET);
-	if (file.Read(check, 8) != 8) return false;
-	if (memcmp(check, "\0\0\0\0\0\0\0\0", 8)) return false;
+	if (file.Read(check, 8) != 8) return NULL;
+	if (memcmp(check, "\0\0\0\0\0\0\0\0", 8)) return NULL;
 
 	return new FEmptyTexture(lumpnum);
 }

src/thingdef/thingdef_expression.cpp

@@ -1032,7 +1032,7 @@ FxCompareRel::FxCompareRel(int o, FxExpression *l, FxExpression *r)
 FxExpression *FxCompareRel::Resolve(FCompileContext& ctx)
 {
 	CHECKRESOLVED();
-	if (!ResolveLR(ctx, true)) return false;
+	if (!ResolveLR(ctx, true)) return NULL;
 
 	if (!ValueType.isNumeric())
 	{
@@ -1126,7 +1126,7 @@ FxExpression *FxCompareEq::Resolve(FCompileContext& ctx)
 {
 	CHECKRESOLVED();
 
-	if (!ResolveLR(ctx, true)) return false;
+	if (!ResolveLR(ctx, true)) return NULL;
 
 	if (!left || !right)
 	{
@@ -1229,7 +1229,7 @@ FxBinaryInt::FxBinaryInt(int o, FxExpression *l, FxExpression *r)
 FxExpression *FxBinaryInt::Resolve(FCompileContext& ctx)
 {
 	CHECKRESOLVED();
-	if (!ResolveLR(ctx, false)) return false;
+	if (!ResolveLR(ctx, false)) return NULL;
 
 	if (ctx.lax && ValueType == VAL_Float)
 	{