Ticket #1851: clean-up-build-with-gcc-4.8.1.patch

trunk/build/premake/premake4.lua

@@ -218 +218 @@
                     -- enable security features (stack checking etc) that shouldn't have
                     -- a significant effect on performance and can catch bugs
                     "-fstack-protector-all",
+                    "-U_FORTIFY_SOURCE",    -- (prevent redefinition if it is already set)
                     "-D_FORTIFY_SOURCE=2",
 
                     -- always enable strict aliasing (useful in debug builds because of the warnings)

trunk/libraries/source/fcollada/include/FCDocument/FCDAnimated.h

@@ -306 +306 @@
     /** Resizes the wanted qualifiers.
         @param qualifiers The new qualifiers for the animated element.
         @param prependDot Whether to prepend the '.' character for all the qualifiers of the animated element. */
-    void Resize(const StringList& qualifiers = NULL, bool prependDot = true);
+    void Resize(const StringList& qualifiers = StringList(), bool prependDot = true);
 };
 
 /** The common qualifier lists. */

trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDAnimated.h

@@ -306 +306 @@
     /** Resizes the wanted qualifiers.
         @param qualifiers The new qualifiers for the animated element.
         @param prependDot Whether to prepend the '.' character for all the qualifiers of the animated element. */
-    void Resize(const StringList& qualifiers = NULL, bool prependDot = true);
+    void Resize(const StringList& qualifiers = StringList(), bool prependDot = true);
 };
 
 /** The common qualifier lists. */

trunk/libraries/source/fcollada/src/Makefile

@@ -273 +273 @@
     rm -rf output
 
 -include $(OBJECTS_ALL:.o=.P)
+
+.SILENT:

trunk/source/graphics/Camera.h

@@ -30 +30 @@
 // view port
 struct SViewPort
 {
-    size_t m_X;
-    size_t m_Y;
-    size_t m_Width;
-    size_t m_Height;
+    int m_X;
+    int m_Y;
+    int m_Width;
+    int m_Height;
 };
 
 class CCamera

trunk/source/lib/code_annotation.h

@@ -174 +174 @@
 //-----------------------------------------------------------------------------
 // cassert
 
+#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
+#define GNU_UNUSED_ATTRIBUTE __attribute__((unused))
+#else
+#define GNU_UNUSED_ATTRIBUTE
+#endif
+
 /**
  * Compile-time assertion. Causes a compile error if the expression
  * evaluates to zero/false.
@@ -183 +189 @@
  *
  * @param expr Expression that is expected to evaluate to non-zero at compile-time.
  **/
-#define cassert(expr) typedef static_assert_<(expr)>::type UID__
+#define cassert(expr) typedef static_assert_<(expr)>::type UID__ GNU_UNUSED_ATTRIBUTE
 template<bool> struct static_assert_;
 template<> struct static_assert_<true>
 {
@@ -196 +202 @@
  * This version must be used if expr uses a dependent type (e.g. depends on
  * a template parameter).
  **/
-#define cassert_dependent(expr) typedef typename static_assert_<(expr)>::type UID__
+#define cassert_dependent(expr) typedef typename static_assert_<(expr)>::type UID__ GNU_UNUSED_ATTRIBUTE
 
 /**
  * @copydoc cassert(expr)

trunk/source/ps/Replay.cpp

@@ -170 +170 @@
         }
         else if (type == "cmd")
         {
-            u32 player;
+            player_id_t player;
             *m_Stream >> player;
 
             std::string line;

trunk/source/simulation2/components/CCmpAIManager.cpp

@@ -963 +963 @@
         
         // Get the territory data
         //  Since getting the territory grid can trigger a recalculation, we check NeedUpdate first
-        bool territoryMapDirty = false;
         Grid<u8> dummyGrid2;
         const Grid<u8>* territoryMap = &dummyGrid2;
         CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSimContext(), SYSTEM_ENTITY);
         if (cmpTerritoryManager && cmpTerritoryManager->NeedUpdate(&m_TerritoriesDirtyID))
         {
             territoryMap = &cmpTerritoryManager->GetTerritoryGrid();
-            territoryMapDirty = true;
         }
         
         LoadPathfinderClasses(state);

trunk/source/soundmanager/items/CBufferItem.cpp

@@ -59 +59 @@
         AL_CHECK
         delete[] al_buf;
     }
-    alSourcei(m_ALSource, AL_BUFFER, NULL);
+    alSourcei(m_ALSource, AL_BUFFER, 0);
     ((CSoundManager*)g_SoundManager)->ReleaseALSource(m_ALSource);
     AL_CHECK
 

trunk/source/soundmanager/items/CSoundBase.cpp

@@ -44 +44 @@
     if (m_ALSource != 0)
     {
         AL_CHECK
-        alSourcei(m_ALSource, AL_BUFFER, NULL);
+        alSourcei(m_ALSource, AL_BUFFER, 0);
         AL_CHECK
         ((CSoundManager*)g_SoundManager)->ReleaseALSource(m_ALSource);
         AL_CHECK

trunk/source/soundmanager/items/CStreamItem.cpp

@@ -55 +55 @@
             AL_CHECK
             delete[] al_buf;
         }
-        alSourcei(m_ALSource, AL_BUFFER, NULL);
+        alSourcei(m_ALSource, AL_BUFFER, 0);
         AL_CHECK
         ((CSoundManager*)g_SoundManager)->ReleaseALSource(m_ALSource);
         AL_CHECK

trunk/source/third_party/mongoose/mongoose.cpp

@@ -1996 +1996 @@
   }
   byteReverse(ctx->in, 14);
 
-  ((uint32_t *) ctx->in)[14] = ctx->bits[0];
-  ((uint32_t *) ctx->in)[15] = ctx->bits[1];
+  memcpy(ctx->in + 14 * sizeof(uint32_t), ctx->bits, sizeof(ctx->bits));
 
   MD5Transform(ctx->buf, (uint32_t *) ctx->in);
   byteReverse((unsigned char *) ctx->buf, 4);