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

Migrate to C++17. Update sol2 to 3.3.0.

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-07-13 20:27:27 +03:00
parent ef66c0ae72
commit b35800059e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/extractor/scripting_environment_lua.cpp
View File

@ -945,10 +945,10 @@ 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;
sol::table table = context.profile_table[table_name]; sol::optional<sol::table> table = context.profile_table[table_name];
if (table.valid()) if (table && table->valid())
{ {
for (auto &&pair : table) for (auto &&pair : *table)
{ {
strings.push_back(pair.second.as<std::string>()); strings.push_back(pair.second.as<std::string>());
} }
@ -963,13 +963,13 @@ 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);
sol::table table = context.profile_table[table_name]; sol::optional<sol::table> table = context.profile_table[table_name];
if (!table.valid()) if (!table || !table->valid())
{ {
return string_lists; return string_lists;
} }
for (const auto &pair : table) for (const auto &pair : *table)
{ {
sol::table inner_table = pair.second; sol::table inner_table = pair.second;
if (!inner_table.valid()) if (!inner_table.valid())