flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Switched LuaState to use sizeof...

Browse Source
This commit is contained in:
tycho 2015-01-31 15:44:14 +00:00
parent fd49e34e33
commit e7424adbf4
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Bindings/LuaState.h
View File

@ -346,20 +346,6 @@ protected:
/** Number of arguments currently pushed (for the Push / Call chain) */ /** Number of arguments currently pushed (for the Push / Call chain) */
int m_NumCurrentFunctionArgs; int m_NumCurrentFunctionArgs;
/** Variadic template terminator: Counting zero args returns zero. */
int CountArgs(void)
{
return 0;
}
/** Variadic template: Counting args means add one to the count of the rest. */
template <typename T, typename... Args>
int CountArgs(T, Args... args)
{
return 1 + CountArgs(args...);
}
/** Variadic template terminator: If there's nothing more to push / pop, just call the function. /** Variadic template terminator: If there's nothing more to push / pop, just call the function.
Note that there are no return values either, because those are prefixed by a cRet value, so the arg list is never empty. */ Note that there are no return values either, because those are prefixed by a cRet value, so the arg list is never empty. */
bool PushCallPop(void) bool PushCallPop(void)
@ -380,7 +366,7 @@ protected:
bool PushCallPop(cLuaState::cRet, Args &&... args) bool PushCallPop(cLuaState::cRet, Args &&... args)
{ {
// Calculate the number of return values (number of args left): // Calculate the number of return values (number of args left):
int NumReturns = CountArgs(args...); int NumReturns = sizeof...(args);
// Call the function: // Call the function:
if (!CallFunction(NumReturns)) if (!CallFunction(NumReturns))