Changeset 204 for trunk/src/lua

Timestamp:

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

Author:

cahir

Message:

Fix warnings on MacOSX 64-bit with clang 3.3

Location:

trunk/src/lua

Files:

• lua_area.cc (modified) (6 diffs)
• lua_aux.cc (modified) (3 diffs)
• lua_path.cc (modified) (4 diffs)
• lua_state.cc (modified) (1 diff)

trunk/src/lua/lua_area.cc

@@ -194 +194 @@
 static int nlua_area_corners_closure( lua_State* L )
 {
-        int index = lua_tointeger( L, lua_upvalueindex(2) ) + 1;
+        int index = static_cast< int >( lua_tointeger( L, lua_upvalueindex(2) ) + 1 );
         lua_pushinteger( L, index );
         lua_replace( L, lua_upvalueindex(2) ); // update
@@ -223 +223 @@
 {
         nv::rectangle* a = nlua_to_parea( L, 1 );
-        a->shrink( lua_tointeger( L, 2 ) );
+        a->shrink( static_cast< int >( lua_tointeger( L, 2 ) ) );
         return 0;
 }
@@ -230 +230 @@
 {
         nv::rectangle* a = nlua_to_parea( L, 1 );
-        nlua_push_area( L, a->shrinked( lua_tointeger( L, 2 ) ) );
+        nlua_push_area( L, a->shrinked( static_cast< int >( lua_tointeger( L, 2 ) ) ) );
         return 1;
 }
@@ -237 +237 @@
 {
         nv::rectangle* a = nlua_to_parea( L, 1 );
-        a->expand( lua_tointeger( L, 2 ) );
+        a->expand( static_cast< int >( lua_tointeger( L, 2 ) ) );
         return 0;
 }
@@ -244 +244 @@
 {
         nv::rectangle* a = nlua_to_parea( L, 1 );
-        nlua_push_area( L, a->expanded( lua_tointeger( L, 2 ) ) );
+        nlua_push_area( L, a->expanded( static_cast< int >( lua_tointeger( L, 2 ) ) ) );
         return 1;
 }
@@ -327 +327 @@
 {
         nv::ivec2 c = nlua_to_coord( L, 1 );
-        int amount = lua_tointeger( L, 1 );
+        int amount = static_cast< int >( lua_tointeger( L, 1 ) );
         nv::ivec2 shift( amount, amount );
         nlua_push_area( L, nv::rectangle( c - shift, c + shift ) );

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 ) );

trunk/src/lua/lua_path.cc

@@ -44 +44 @@
 }
 
-void lua::path::push( uint32 e )
+void lua::path::push( size_t e )
 {
         m_elements[ m_count ].value  = e;
@@ -51 +51 @@
 }
 
-void lua::path::push( uint32 start, uint32 length )
+void lua::path::push( size_t start, size_t length )
 {
         m_elements[ m_count ].value  = start;
@@ -58 +58 @@
 }
 
-void lua::path::push( const char* p, uint32 length )
+void lua::path::push( const char* p, size_t length )
 {
         m_elements[ m_count ].value  = m_path.length();
@@ -66 +66 @@
 }
 
-void lua::path::push( const std::string& s, uint32 length )
+void lua::path::push( const std::string& s, size_t length )
 {
         m_elements[ m_count ].value  = m_path.length();

trunk/src/lua/lua_state.cc

@@ -249 +249 @@
 {
         lua_getfield( L->L, -1, element.c_str() );
-        int result = lua_type( L->L, -1 ) == LUA_TNUMBER ? lua_tointeger( L->L, -1 ) : defval;
-        lua_pop( L->L, 1 );
-        return result;
+        lua_Integer result = lua_type( L->L, -1 ) == LUA_TNUMBER ? lua_tointeger( L->L, -1 ) : defval;
+        lua_pop( L->L, 1 );
+        return static_cast< int >( result );
 }