StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

SIGH g++

Browse Source
This commit is contained in:
ThePhD 2016-05-19 17:31:57 -04:00
parent 9f019ae536
commit e244a2bb67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sol/state_view.hpp
View File

@ -175,13 +175,13 @@ public:
stack::push(L, function_args<function_sig<>>(std::forward<Fx>(openfx))); stack::push(L, function_args<function_sig<>>(std::forward<Fx>(openfx)));
lua_CFunction openf = stack::pop<lua_CFunction>(L); lua_CFunction openf = stack::pop<lua_CFunction>(L);
luaL_requiref(L, key.c_str(), openf, is_global_library ? 1 : 0); luaL_requiref(L, key.c_str(), openf, is_global_library ? 1 : 0);
object r stack::pop<object>(L); object r = stack::pop<object>(L);
lua_pop(L, 1); lua_pop(L, 1);
return r; return r;
} }
object require_script(const std::string& key, const std::string& code) { object require_script(const std::string& key, const std::string& code) {
optional<object> loaded = traverse_get<optional<object>>("package", "loaded", key); optional<object> loaded = global.traverse_get<optional<object>>("package", "loaded", key);
bool ismod = loaded && !(loaded->is<bool>() && !loaded->as<bool>()); bool ismod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
if (ismod) if (ismod)
return std::move(*loaded); return std::move(*loaded);
@ -193,7 +193,7 @@ public:
} }
object require_file(const std::string& key, const std::string& file) { object require_file(const std::string& key, const std::string& file) {
auto loaded = traverse_get<optional<object>>("package", "loaded", key); auto loaded = global.traverse_get<optional<object>>("package", "loaded", key);
bool ismod = loaded && !(loaded->is<bool>() && !loaded->as<bool>()); bool ismod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
if (loaded) if (loaded)
return std::move(*loaded); return std::move(*loaded);