1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-29 21:49:07 +00:00

Merge pull request #137 from marcpayne/lua53-compile-fix

Fix compile error with Lua 5.3
This commit is contained in:
Brenden Matthews 2015-08-24 08:09:00 -07:00
commit b3c95959bc

View File

@ -171,6 +171,14 @@ namespace lua {
return nresults;
}
// Overloaded for Lua 5.3+ as lua_gettable and others return an int
template<int (*misc)(lua_State *, int), int nresults>
int safe_misc_trampoline(lua_State *l)
{
misc(l, 1);
return nresults;
}
int safe_next_trampoline(lua_State *l)
{
int r = lua_next(l, 1);