Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix lua nil for MacOS

Browse Source
This commit is contained in:
Desone Burns II 2020-11-24 08:26:24 -07:00
parent cf13a9714d
commit 1ce573ef35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/extractor/scripting_environment_lua.cpp
View File

@ -88,7 +88,7 @@ struct to_lua_object : public boost::static_visitor<sol::object>
{ {
to_lua_object(sol::state &state) : state(state) {} to_lua_object(sol::state &state) : state(state) {}
template <typename T> auto operator()(T &v) const { return sol::make_object(state, v); } template <typename T> auto operator()(T &v) const { return sol::make_object(state, v); }
auto operator()(boost::blank &) const { return sol::nil; } auto operator()(boost::blank &) const { return sol::lua_nil; }
sol::state &state; sol::state &state;
}; };
} // namespace } // namespace
@ -236,7 +236,7 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
auto get_location_tag = [](auto &context, const auto &location, const char *key) { auto get_location_tag = [](auto &context, const auto &location, const char *key) {
if (context.location_dependent_data.empty()) if (context.location_dependent_data.empty())
return sol::object(sol::nil); return sol::object(sol::lua_nil);
const LocationDependentData::point_t point{location.lon(), location.lat()}; const LocationDependentData::point_t point{location.lon(), location.lat()};
if (!boost::geometry::equals(context.last_location_point, point)) if (!boost::geometry::equals(context.last_location_point, point))
@ -943,7 +943,7 @@ Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
auto &context = GetSol2Context(); auto &context = GetSol2Context();
BOOST_ASSERT(context.state.lua_state() != nullptr); BOOST_ASSERT(context.state.lua_state() != nullptr);
std::vector<std::string> strings; std::vector<std::string> strings;
if (context.profile_table[table_name] == sol::nil) if (context.profile_table[table_name] == nullptr)
{ {
return strings; return strings;
} }
@ -965,7 +965,7 @@ Sol2ScriptingEnvironment::GetStringListsFromTable(const std::string &table_name)
auto &context = GetSol2Context(); auto &context = GetSol2Context();
BOOST_ASSERT(context.state.lua_state() != nullptr); BOOST_ASSERT(context.state.lua_state() != nullptr);
if (context.profile_table[table_name] == sol::nil) if (context.profile_table[table_name] == nullptr)
{ {
return string_lists; return string_lists;
} }