[luabind-cvs] luabind/luabind/src pcall.cpp,1.3,1.4
Brought to you by:
arvidn,
daniel_wallin
From: Arvid N. <ar...@us...> - 2006-05-29 18:30:54
|
Update of /cvsroot/luabind/luabind/luabind/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10361/luabind/src Modified Files: pcall.cpp Log Message: Applied patch by Evan Wies to make it work with lua 5.1 Index: pcall.cpp =================================================================== RCS file: /cvsroot/luabind/luabind/luabind/src/pcall.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pcall.cpp 15 Apr 2004 12:37:49 -0000 1.3 +++ pcall.cpp 29 May 2006 18:30:41 -0000 1.4 @@ -45,7 +45,14 @@ int resume_impl(lua_State *L, int nargs, int) { +#if LUA_VERSION_NUM >= 501 + // Lua 5.1 added LUA_YIELD as a possible return value, + // this was causing crashes, because the caller expects 0 on success. + int res = lua_resume(L, nargs); + return (res == LUA_YIELD) ? 0 : res; +#else return lua_resume(L, nargs); +#endif } }} |