@@ -88,7 +88,7 @@ struct to_lua_object : public boost::static_visitor<sol::object>
88
88
{
89
89
to_lua_object (sol::state &state) : state(state) {}
90
90
template <typename T> auto operator ()(T &v) const { return sol::make_object (state, v); }
91
- auto operator ()(boost::blank &) const { return sol::nil ; }
91
+ auto operator ()(boost::blank &) const { return sol::lua_nil ; }
92
92
sol::state &state;
93
93
};
94
94
} // namespace
@@ -236,7 +236,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
236
236
237
237
auto get_location_tag = [](auto &context, const auto &location, const char *key) {
238
238
if (context.location_dependent_data .empty ())
239
- return sol::object (sol::nil );
239
+ return sol::object (sol::lua_nil );
240
240
241
241
const LocationDependentData::point_t point{location.lon (), location.lat ()};
242
242
if (!boost::geometry::equals (context.last_location_point , point))
@@ -943,7 +943,7 @@ Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
943
943
auto &context = GetSol2Context ();
944
944
BOOST_ASSERT (context.state .lua_state () != nullptr );
945
945
std::vector<std::string> strings;
946
- if (context.profile_table [table_name] == sol::nil )
946
+ if (context.profile_table [table_name] == nullptr )
947
947
{
948
948
return strings;
949
949
}
@@ -965,7 +965,7 @@ Sol2ScriptingEnvironment::GetStringListsFromTable(const std::string &table_name)
965
965
966
966
auto &context = GetSol2Context ();
967
967
BOOST_ASSERT (context.state .lua_state () != nullptr );
968
- if (context.profile_table [table_name] == sol::nil )
968
+ if (context.profile_table [table_name] == nullptr )
969
969
{
970
970
return string_lists;
971
971
}
0 commit comments