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

Merge pull request #1839 from sebastic/occurred-typo

Browse Source 
Fix 'occured' typo, replace with 'occurred'.
This commit is contained in:
Patrick Niklaus 2015-12-26 13:39:07 +01:00
commit 758d402305
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extractor/extractor.cpp
View File

@ -342,14 +342,14 @@ void extractor::SetupScriptingEnvironment(lua_State *lua_state,
if (0 != luaL_dofile(lua_state, config.profile_path.string().c_str())) if (0 != luaL_dofile(lua_state, config.profile_path.string().c_str()))
{ {
std::stringstream msg; std::stringstream msg;
msg << lua_tostring(lua_state, -1) << " occured in scripting block"; msg << lua_tostring(lua_state, -1) << " occurred in scripting block";
throw osrm::exception(msg.str()); throw osrm::exception(msg.str());
} }
if (0 != luaL_dostring(lua_state, "return traffic_signal_penalty\n")) if (0 != luaL_dostring(lua_state, "return traffic_signal_penalty\n"))
{ {
std::stringstream msg; std::stringstream msg;
msg << lua_tostring(lua_state, -1) << " occured in scripting block"; msg << lua_tostring(lua_state, -1) << " occurred in scripting block";
throw osrm::exception(msg.str()); throw osrm::exception(msg.str());
} }
speed_profile.traffic_signal_penalty = 10 * lua_tointeger(lua_state, -1); speed_profile.traffic_signal_penalty = 10 * lua_tointeger(lua_state, -1);
@ -359,7 +359,7 @@ void extractor::SetupScriptingEnvironment(lua_State *lua_state,
if (0 != luaL_dostring(lua_state, "return u_turn_penalty\n")) if (0 != luaL_dostring(lua_state, "return u_turn_penalty\n"))
{ {
std::stringstream msg; std::stringstream msg;
msg << lua_tostring(lua_state, -1) << " occured in scripting block"; msg << lua_tostring(lua_state, -1) << " occurred in scripting block";
throw osrm::exception(msg.str()); throw osrm::exception(msg.str());
} }

2
extractor/restriction_parser.cpp
View File

@ -51,7 +51,7 @@ namespace
int lua_error_callback(lua_State *lua_state) int lua_error_callback(lua_State *lua_state)
{ {
std::string error_msg = lua_tostring(lua_state, -1); std::string error_msg = lua_tostring(lua_state, -1);
throw osrm::exception("ERROR occured in profile script:\n" + error_msg); throw osrm::exception("ERROR occurred in profile script:\n" + error_msg);
} }
} }

4
extractor/scripting_environment.cpp
View File

@ -59,7 +59,7 @@ int lua_error_callback(lua_State *L) // This is so I can use my own function as
std::string error_msg = lua_tostring(L, -1); std::string error_msg = lua_tostring(L, -1);
std::ostringstream error_stream; std::ostringstream error_stream;
error_stream << error_msg; error_stream << error_msg;
throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str()); throw osrm::exception("ERROR occurred in profile script:\n" + error_stream.str());
} }
} }
@ -154,7 +154,7 @@ void ScriptingEnvironment::init_lua_state(lua_State *lua_state)
luabind::object error_msg(luabind::from_stack(lua_state, -1)); luabind::object error_msg(luabind::from_stack(lua_state, -1));
std::ostringstream error_stream; std::ostringstream error_stream;
error_stream << error_msg; error_stream << error_msg;
throw osrm::exception("ERROR occured in profile script:\n" + error_stream.str()); throw osrm::exception("ERROR occurred in profile script:\n" + error_stream.str());
} }
} }