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

revert using protected_function for old GetStringListFromFunction and source_function #6564

Browse Source
This commit is contained in:
Matt Bhagat-Conway 2023-03-08 10:11:38 -05:00
parent 9ef98a794a
commit ac021140a6
No known key found for this signature in database
GPG Key ID: EB64FF36E7DA441A
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/extractor/scripting_environment_lua.cpp
View File

@ -864,12 +864,10 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
BOOST_ASSERT(context.properties.GetTrafficSignalPenalty() == 0); BOOST_ASSERT(context.properties.GetTrafficSignalPenalty() == 0);
// call source_function if present // call source_function if present
sol::protected_function source_function = context.state["source_function"]; sol::function source_function = context.state["source_function"];
if (source_function.valid()) if (source_function.valid())
{ {
auto luares = source_function(); source_function();
if (!luares.valid())
handle_lua_error(luares);
} }
break; break;
@ -982,12 +980,10 @@ Sol2ScriptingEnvironment::GetStringListFromFunction(const std::string &function_
auto &context = GetSol2Context(); auto &context = GetSol2Context();
BOOST_ASSERT(context.state.lua_state()); BOOST_ASSERT(context.state.lua_state());
std::vector<std::string> strings; std::vector<std::string> strings;
sol::protected_function function = context.state[function_name]; sol::function function = context.state[function_name];
if (function.valid()) if (function.valid())
{ {
auto luares = function(strings); function(strings);
if (!luares.valid())
handle_lua_error(luares);
} }
return strings; return strings;
} }