Changeset 406 for trunk/src/lib/lua.cc

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/lib/lua.cc (modified) (4 diffs)

trunk/src/lib/lua.cc

@@ -128 +128 @@
 static const lua_Number *lua_version_51 (lua_State*) 
 {
-        static const lua_Number version = (lua_Number)LUA_VERSION_NUM;
+        static const lua_Number version = lua_Number( LUA_VERSION_NUM );
         return &version;
 }
@@ -227 +227 @@
 #endif
 
-#       define NV_LUA_FUN( rtype, fname, fparams ) *(void **) (&fname) = lua_library.get(#fname);
+#       define NV_LUA_FUN( rtype, fname, fparams ) void_assign( fname, lua_library.get(#fname) );
 #       if NV_LUA_VERSION == NV_LUA_52
 #               define NV_LUA_FUN_51( rtype, fname, fparams )
@@ -246 +246 @@
 
 #if NV_LUA_VERSION == NV_LUA_5C
-#       define NV_LUA_LOAD( fname ) *(void **) (&fname) = lua_library.get(#fname);
-#       define NV_LUA_LOAD_AS( fname,fname2 ) *(void **) (&fname) = lua_library.get(#fname2);
+#       define NV_LUA_LOAD( fname ) void_assign( fname, lua_library.get(#fname) );
+#       define NV_LUA_LOAD_AS( fname,fname2 ) void_assign( fname, lua_library.get(#fname2) );
         bool version_52 = lua_library.try_get("luaL_checkversion_") != nullptr;
         if (version_52)
         {
 #       define NV_LUA_COMPAT_FUN( u1, fn, u2, u3, fn2, u5, u6, u7 ) \
-        *(void **) (&(fn2##_compat)) = lua_library.get(#fn2); \
+        void_assign( fn2##_compat, lua_library.get(#fn2) ); \
         fn = call_##fn2##_compat; 
 #       include <nv/lib/detail/lua_functions_compat.inc>
@@ -280 +280 @@
         {
 #       define NV_LUA_COMPAT_FUN( u1, fn, u2, u3, u4, u5, u6, u7 ) \
-                *(void **) (&fn) = lua_library.get(#fn);
+                void_assign(fn, lua_library.get(#fn) );
 #       include <nv/lib/detail/lua_functions_compat.inc>
 #       undef NV_LUA_COMPAT_FUN