diff options
Diffstat (limited to '3rdparty/sol2/sol/simple_usertype_metatable.hpp')
-rw-r--r-- | 3rdparty/sol2/sol/simple_usertype_metatable.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/sol2/sol/simple_usertype_metatable.hpp b/3rdparty/sol2/sol/simple_usertype_metatable.hpp index 482ad8037dc..7570a32960b 100644 --- a/3rdparty/sol2/sol/simple_usertype_metatable.hpp +++ b/3rdparty/sol2/sol/simple_usertype_metatable.hpp @@ -90,7 +90,7 @@ namespace sol { } luaL_getmetatable(L, metakey); int tableindex = lua_gettop(L); - if (type_of(L, tableindex) == type::nil) { + if (type_of(L, tableindex) == type::lua_nil) { continue; } stack::set_field<false, true>(L, stack_reference(L, 2), stack_reference(L, 3), tableindex); @@ -131,9 +131,9 @@ namespace sol { } // Check table storage first for a method that works luaL_getmetatable(L, sm.metakey); - if (type_of(L, -1) != type::nil) { + if (type_of(L, -1) != type::lua_nil) { stack::get_field<false, true>(L, accessor.c_str(), lua_gettop(L)); - if (type_of(L, -1) != type::nil) { + if (type_of(L, -1) != type::lua_nil) { // Woo, we found it? lua_remove(L, -2); return 1; @@ -302,7 +302,7 @@ namespace sol { private: template<std::size_t... I, typename Tuple> simple_usertype_metatable(usertype_detail::verified_tag, std::index_sequence<I...>, lua_State* L, Tuple&& args) - : callconstructfunc(nil), + : callconstructfunc(lua_nil), indexfunc(&usertype_detail::indexing_fail<true>), newindexfunc(&usertype_detail::indexing_fail<false>), indexbase(&usertype_detail::simple_core_indexing_call<true>), newindexbase(&usertype_detail::simple_core_indexing_call<false>), indexbaseclasspropogation(usertype_detail::walk_all_bases<true>), newindexbaseclasspropogation(&usertype_detail::walk_all_bases<false>), |