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

Lua/LuaInstance: Fix compilation under Clang/GCC 

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
Show Stats 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; m_methods[name] = method;
} }
template<class T> template<class T>
template<typename R, typename P, typename... Args, typename... DefArgs> 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) 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 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(); handler.ProcessArgs();
return handler.Invoke(func); return handler.Invoke(func);
@ -225,7 +225,7 @@ namespace Nz
{ {
SetStaticMethod(name, [func, defArgs...] (LuaInstance& instance) -> int SetStaticMethod(name, [func, defArgs...] (LuaInstance& instance) -> int
{ {
LuaImplFunctionProxy<Args...>::Impl<DefArgs...> handler(instance); typename LuaImplFunctionProxy<Args...>::template Impl<DefArgs...> handler(instance);
handler.ProcessArgs(); handler.ProcessArgs();
return handler.Invoke(func); return handler.Invoke(func);

16
include/Nazara/Lua/LuaInstance.inl
View File

@ -196,21 +196,21 @@ namespace Nz
return retVal; return retVal;
} }
template<typename hasDefault> template<bool HasDefault>
struct LuaImplArgProcesser; struct LuaImplArgProcesser;
template<> template<>
struct LuaImplArgProcesser<std::true_type> struct LuaImplArgProcesser<true>
{ {
template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer> template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer>
static void Process(LuaInstance& instance, ArgContainer& args, DefArgContainer& defArgs) static void Process(LuaInstance& instance, ArgContainer& args, DefArgContainer& defArgs)
{ {
std::get<N>(args) = std::move(LuaImplQueryArg(instance, N + 1, std::get<N - FirstDefArg>(defArgs), TypeTag<ArgType>())); std::get<N>(args) = std::move(LuaImplQueryArg(instance, N + 1, std::get<std::tuple_size<DefArgContainer>() - N + FirstDefArg - 1>(defArgs), TypeTag<ArgType>()));
} }
}; };
template<> template<>
struct LuaImplArgProcesser<std::false_type> struct LuaImplArgProcesser<false>
{ {
template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer> template<std::size_t N, std::size_t FirstDefArg, typename ArgType, typename ArgContainer, typename DefArgContainer>
static void Process(LuaInstance& instance, ArgContainer& args, DefArgContainer& defArgs) static void Process(LuaInstance& instance, ArgContainer& args, DefArgContainer& defArgs)
@ -272,8 +272,7 @@ namespace Nz
template<std::size_t N, typename ArgType> template<std::size_t N, typename ArgType>
void ProcessArgs() void ProcessArgs()
{ {
using CheckDefValue = typename std::integral_constant<bool, N >= FirstDefArg>; LuaImplArgProcesser<(N >= FirstDefArg)>::template Process<N, FirstDefArg, ArgType>(m_instance, m_args, m_defaultArgs);
LuaImplArgProcesser<CheckDefValue>::Process<N, FirstDefArg, ArgType>(m_instance, m_args, m_defaultArgs);
} }
template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest> template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest>
@ -355,8 +354,7 @@ namespace Nz
template<std::size_t N, typename ArgType> template<std::size_t N, typename ArgType>
void ProcessArgs() void ProcessArgs()
{ {
using CheckDefValue = typename std::integral_constant<bool, N >= FirstDefArg>; LuaImplArgProcesser<(N >= FirstDefArg)>::template Process<N, FirstDefArg, ArgType>(m_instance, m_args, m_defaultArgs);
LuaImplArgProcesser<CheckDefValue>::Process<N, FirstDefArg, ArgType>(m_instance, m_args, m_defaultArgs);
} }
template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest> template<std::size_t N, typename ArgType1, typename ArgType2, typename... Rest>
@ -396,7 +394,7 @@ namespace Nz
{ {
PushFunction([func, defArgs...](LuaInstance& instance) -> int PushFunction([func, defArgs...](LuaInstance& instance) -> int
{ {
LuaImplFunctionProxy<Args...>::Impl<DefArgs...> handler(instance); typename LuaImplFunctionProxy<Args...>::template Impl<DefArgs...> handler(instance, defArgs...);
handler.ProcessArgs(); handler.ProcessArgs();
return handler.Invoke(func); return handler.Invoke(func);