Changeset 121 for trunk/src/lua/lua_glm.cc

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/src/lua/lua_glm.cc (modified) (5 diffs)

trunk/src/lua/lua_glm.cc

@@ -12 +12 @@
 static size_t nlua_swizzel_lookup[256];
 
-inline bool nlua_is_swizzel( const char* str, size_t max )
+inline bool nlua_is_swizzel( const unsigned char* str, size_t max )
 {
         while (*str)
@@ -24 +24 @@
 template < typename T, size_t k >
 struct nlua_vec_constructor {
-        static inline T construct( lua_State* L, int index ) {
+        static inline T construct( lua_State*, int ) {
                 return T();
         }
@@ -202 +202 @@
         size_t len  = 0;
         size_t vlen = v->length();
-        const char * key = lua_tolstring( L, 2, &len );
+        const unsigned char * key = (const unsigned char *)( lua_tolstring( L, 2, &len ) );
         size_t idx = 255;
 
@@ -240 +240 @@
         size_t len  = 0;
         size_t vlen = v->length();
-        const char * key = lua_tolstring( L, 2, &len );
+        const unsigned char * key = (const unsigned char *)( lua_tolstring( L, 2, &len ) );
         size_t idx = 255;
         if( len == 1 )
@@ -321 +321 @@
 { 
         for (size_t i = 0; i < 256; ++i ) nlua_swizzel_lookup[i] = 255;
-        nlua_swizzel_lookup['x'] = 0;
-        nlua_swizzel_lookup['r'] = 0;
-        nlua_swizzel_lookup['s'] = 0;
-        nlua_swizzel_lookup['0'] = 0;
-        nlua_swizzel_lookup['y'] = 1;
-        nlua_swizzel_lookup['g'] = 1;
-        nlua_swizzel_lookup['t'] = 0;
-        nlua_swizzel_lookup['1'] = 1;
-        nlua_swizzel_lookup['z'] = 2;
-        nlua_swizzel_lookup['b'] = 2;
-        nlua_swizzel_lookup['u'] = 0;
-        nlua_swizzel_lookup['2'] = 2;
-        nlua_swizzel_lookup['w'] = 3;
-        nlua_swizzel_lookup['a'] = 3;
-        nlua_swizzel_lookup['v'] = 0;
-        nlua_swizzel_lookup['3'] = 3;
+        using nv::char8;
+        nlua_swizzel_lookup[char8( 'x' )] = 0;
+        nlua_swizzel_lookup[char8( 'r' )] = 0;
+        nlua_swizzel_lookup[char8( 's' )] = 0;
+        nlua_swizzel_lookup[char8( '0' )] = 0;
+        nlua_swizzel_lookup[char8( 'y' )] = 1;
+        nlua_swizzel_lookup[char8( 'g' )] = 1;
+        nlua_swizzel_lookup[char8( 't' )] = 0;
+        nlua_swizzel_lookup[char8( '1' )] = 1;
+        nlua_swizzel_lookup[char8( 'z' )] = 2;
+        nlua_swizzel_lookup[char8( 'b' )] = 2;
+        nlua_swizzel_lookup[char8( 'u' )] = 0;
+        nlua_swizzel_lookup[char8( '2' )] = 2;
+        nlua_swizzel_lookup[char8( 'w' )] = 3;
+        nlua_swizzel_lookup[char8( 'a' )] = 3;
+        nlua_swizzel_lookup[char8( 'v' )] = 0;
+        nlua_swizzel_lookup[char8( '3' )] = 3;
         int stack = lua_gettop( L );
 
-        luaL_requiref(L, "ivec2", luaopen_vec<glm::ivec2>, 1);
-        luaL_requiref(L, "ivec3", luaopen_vec<glm::ivec3>, 1);
-        luaL_requiref(L, "ivec4", luaopen_vec<glm::ivec4>, 1);
-        luaL_requiref(L, "vec2", luaopen_vec<glm::vec2>, 1);
-        luaL_requiref(L, "vec3", luaopen_vec<glm::vec3>, 1);
-        luaL_requiref(L, "vec4", luaopen_vec<glm::vec4>, 1);
+        luaL_requiref(L, "ivec2", luaopen_vec<nv::ivec2>, 1);
+        luaL_requiref(L, "ivec3", luaopen_vec<nv::ivec3>, 1);
+        luaL_requiref(L, "ivec4", luaopen_vec<nv::ivec4>, 1);
+        luaL_requiref(L, "vec2", luaopen_vec<nv::vec2>, 1);
+        luaL_requiref(L, "vec3", luaopen_vec<nv::vec3>, 1);
+        luaL_requiref(L, "vec4", luaopen_vec<nv::vec4>, 1);
         lua_settop( L, stack );
 }