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

Lua/LuaInstance: Fix compilation under Clang/GCC

Browse Source 
A big thank to gbdivers on this one


Former-commit-id: f96a61ef101b7c9512ada719c82b0836aed3738b
This commit is contained in:
Lynix
2015-12-09 16:34:50 +01:00
parent 688aed0160
commit 11abcc7da4
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,7 @@ namespace Nz
{
m_methods[name] = method;
}
template<class T>
template<typename R, typename P, typename... Args, typename... DefArgs>
std::enable_if_t<std::is_base_of<P, T>::value> LuaClass<T>::SetMethod(const String& name, R(P::*func)(Args...), DefArgs... defArgs)
@@ -194,7 +194,7 @@ namespace Nz
{
SetMethod(name, [func, defArgs...] (LuaInstance& instance, T& object) -> int
{
LuaImplMethodProxy<T, Args...>::Impl<DefArgs...> handler(instance, object, defArgs...);
typename LuaImplMethodProxy<T, Args...>::template Impl<DefArgs...> handler(instance, object, defArgs...);
handler.ProcessArgs();
return handler.Invoke(func);
@@ -225,7 +225,7 @@ namespace Nz
{
SetStaticMethod(name, [func, defArgs...] (LuaInstance& instance) -> int
{
LuaImplFunctionProxy<Args...>::Impl<DefArgs...> handler(instance);
typename LuaImplFunctionProxy<Args...>::template Impl<DefArgs...> handler(instance);
handler.ProcessArgs();
return handler.Invoke(func);