Changeset 204 for trunk/src/lua/lua_aux.cc

Timestamp:

08/17/13 21:22:56 (12 years ago)

Author:

cahir

Message:

Fix warnings on MacOSX 64-bit with clang 3.3

File:

• trunk/src/lua/lua_aux.cc (modified) (3 diffs)

trunk/src/lua/lua_aux.cc

@@ -91 +91 @@
 static int nluaaux_math_dieroll( lua_State* L )
 {
-        int dice  = luaL_checkinteger( L,  1 );
-        int sides = luaL_checkinteger( L,  2 );
+        lua_Integer dice  = luaL_checkinteger( L,  1 );
+        lua_Integer sides = luaL_checkinteger( L,  2 );
         if ( dice < 1 )  luaL_argerror( L, 1, "die count lower than 1!" );
         if ( sides < 1 ) luaL_argerror( L, 2, "side count lower than 1!" );
@@ -109 +109 @@
                 if ( lua_gettop( L ) == 1 )
                 {
-                        int arg1 = luaL_checkinteger( L, 1 );
+                        lua_Integer arg1 = luaL_checkinteger( L, 1 );
                         if ( arg1 < 1 ) arg1 = 1;
                         lua_pushunsigned( L, nv::random::get().urange( 1, static_cast<nv::uint32>( arg1 ) ) );
@@ -115 +115 @@
                 else
                 {
-                        int arg1 = luaL_checkinteger( L, 1 );
-                        int arg2 = luaL_checkinteger( L, 2 );
+                        int arg1 = static_cast< int >( luaL_checkinteger( L, 1 ) );
+                        int arg2 = static_cast< int >( luaL_checkinteger( L, 2 ) );
                         if (arg2 < arg1) std::swap( arg2, arg1 );
                         lua_pushinteger( L, nv::random::get().srange( arg1, arg2 ) );