sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some GCC warnings

Browse Source 
Former-commit-id: 31c8460b4656c29ac165d7aa28f335851f2565df
This commit is contained in:
Lynix
2016-05-25 13:52:10 +02:00
parent 840b03691a
commit 8a3339badf
19 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Lua/LuaClass.inl
View File

@@ -21,6 +21,8 @@ namespace Nz
{
SetConstructor([] (Nz::LuaInstance& lua, T* instance)
{
NazaraUnused(lua);
PlacementNew(instance);
return true;
});
@@ -132,9 +134,9 @@ namespace Nz
lua.SetField(pair.first); // Method name
}
m_info->instanceGetters[m_info->name] = [info = m_info] (LuaInstance& lua)
m_info->instanceGetters[m_info->name] = [info = m_info] (LuaInstance& instance)
{
return static_cast<T*>(lua.CheckUserdata(1, info->name));
return static_cast<T*>(instance.CheckUserdata(1, info->name));
};
}
lua.Pop(); // On pop la metatable
@@ -391,11 +393,11 @@ namespace Nz
if (!lua.IsValid(-1))
{
for (const ParentFunc& getter : info->parentGetters)
for (const ParentFunc& parentGetter : info->parentGetters)
{
lua.Pop(); //< Pop the last nil value
getter(lua, instance);
parentGetter(lua, instance);
if (lua.IsValid(-1))
return;
}