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

Timestamp:

05/16/15 23:12:22 (10 years ago)

Author:

epyon

Message:

• fixed compilation and warnings on gcc
• slowly removing/merging external includes

File:

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

trunk/src/lua/lua_aux.cc

@@ -7 +7 @@
 #include "nv/lua/lua_aux.hh"
 
-#include <utility>
 #include "nv/lua/lua_raw.hh"
 #include "nv/core/random.hh"
@@ -117 +116 @@
                         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 ) );
+                        int result = ( arg2 >= arg1 ? nv::random::get().srange( arg1, arg2 ) : nv::random::get().srange( arg2, arg1 ) );
+                        lua_pushinteger( L, result );
                 }
         }