Changeset 2444 for trunkTweet

Timestamp:

Feb 19, 2013, 2:19:03 AM (8 years ago)

Author:

sam

Message:

build: fix compiler warnings and Linux and PS3 build issues.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/easymesh/easymesh.h (modified) (2 diffs)
• src/lol/math/interp.h (modified) (1 diff)
• src/numeric.h (modified) (1 diff)
• src/scene.cpp (modified) (1 diff)
• src/ticker.cpp (modified) (1 diff)

trunk/configure.ac

@@ -443 +443 @@
   people/touky/Makefile
   people/touky/private/Makefile
+  people/touky/private/Tactics/Makefile
   people/jylam/Makefile
   people/jylam/private/Makefile

trunk/src/easymesh/easymesh.h

@@ -66 +66 @@
     ShaderAttrib const *GetAttribute(const lol::String &attribute);
     //--
-    virtual void SetupShaderDatas(mat4 const &model) { }
+    virtual void SetupShaderDatas(mat4 const &model) { UNUSED(model); }
 
 protected:
@@ -357 +357 @@
         {
             TexCoordBuildType tcbt = GetTexCoordBuildType2(mt);
+            UNUSED(tcbt);
             if (mt == MeshType::Triangle)
                 mt = mt;

trunk/src/lol/math/interp.h

@@ -51 +51 @@
         int start = max(0, m_pos);
         int a = 0;
-        int b = min(m_pos + N, N);
+        int b = min(m_pos + N - 1, N - 1);
 
         while (a + 1 < b)

trunk/src/numeric.h

@@ -27 +27 @@
 {
     using namespace std;
-    return (float)rand() / RAND_MAX;
+    return (float)std::rand() / RAND_MAX;
 }
 

trunk/src/scene.cpp

@@ -176 +176 @@
     {
         Tile tmp = data->m_tiles[i];
-        int j = rand() % data->m_tiles.Count();
+        int j = std::rand() % data->m_tiles.Count();
         data->m_tiles[i] = data->m_tiles[j];
         data->m_tiles[j] = tmp;

trunk/src/ticker.cpp

@@ -186 +186 @@
 
         /* Ensure some randomness */
-        (void)rand();
+        (void)std::rand();
 
         /* If recording with fixed framerate, set deltatime to a fixed value */