- Removed new warning when using CMake 2.6.

- Fixed compilation of snes_spc on GCC <4.3.
- Fixed compilation of zstring.h on 32-bit MinGW, where SIZE_MAX
  and UINT_MAX are not considered identical by the preprocessor.

SVN r1096 (trunk)

snes_spc/CMakeLists.txt

@@ -5,7 +5,7 @@ include( CheckCXXCompilerFlag )
 set( CMAKE_BUILD_TYPE "RelWithDebInfo" )
 
 if( CMAKE_COMPILER_IS_GNUCXX )
-	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fomit-frame-pointer -Wno-array-bounds" )
+	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fomit-frame-pointer" )
 	check_cxx_compiler_flag( -Wno-array-bounds HAVE_NO_ARRAY_BOUNDS )
 	if( HAVE_NO_ARRAY_BOUNDS )
 		set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-array-bounds" )

src/CMakeLists.txt

@@ -1,4 +1,9 @@
 cmake_minimum_required( VERSION 2.4 )
+
+if( COMMAND cmake_policy )
+	cmake_policy( SET CMP0003 NEW )
+endif( COMMAND cmake_policy )
+
 include( CheckFunctionExists )
 include( FindPkgConfig )
 

src/g_doom/a_bossbrain.cpp

@@ -251,4 +251,3 @@ void A_SpawnSound (AActor *self)
 	S_Sound (self, CHAN_BODY, "brain/cube", 1, ATTN_IDLE);
 	A_SpawnFly (self);
 }
-

src/g_shared/a_specialspot.cpp

@@ -370,5 +370,3 @@ void ASpecialSpot::Destroy()
 	if (state != NULL) state->RemoveSpot(this);
 	Super::Destroy();
 }
-
-

src/g_shared/a_specialspot.h

@@ -42,4 +42,4 @@ public:
 
 
 
-#endif
+#endif

src/zstring.h

@@ -140,10 +140,9 @@ public:
 
 	const char *GetChars() const { return Chars; }
 	const char &operator[] (int index) const { return Chars[index]; }
-#if SIZE_MAX != UINT_MAX
 	const char &operator[] (unsigned int index) const { return Chars[index]; }
-#endif
-	const char &operator[] (size_t index) const { return Chars[index]; }
+	const char &operator[] (unsigned long index) const { return Chars[index]; }
+	const char &operator[] (unsigned long long index) const { return Chars[index]; }
 
 	FString &operator = (const FString &other);
 	FString &operator = (const char *copyStr);