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

fix OCLint warning: short variable name, unused parameter

Browse Source
This commit is contained in:
Dennis Luxen 2014-11-20 14:55:43 +01:00
parent cbfbcdcff5
commit c658ee5c78
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Extractor/Extractor.cpp
View File

@ -210,8 +210,7 @@ int Extractor::Run(int argc, char *argv[])
case osmium::item_type::relation: case osmium::item_type::relation:
++number_of_relations; ++number_of_relations;
resulting_restrictions.push_back( resulting_restrictions.push_back(
restriction_parser.TryParse(scripting_environment.getLuaState(), restriction_parser.TryParse(static_cast<osmium::Relation &>(*entity)));
static_cast<osmium::Relation &>(*entity)));
break; break;
default: default:
++number_of_others; ++number_of_others;

8
Extractor/RestrictionParser.cpp
View File

@ -39,13 +39,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <cstring>
namespace namespace
{ {
int lua_error_callback(lua_State *L) int lua_error_callback(lua_State *lua_state)
{ {
luabind::object error_msg(luabind::from_stack(L, -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 OSRMException("ERROR occured in profile script:\n" + error_stream.str()); throw OSRMException("ERROR occured in profile script:\n" + error_stream.str());
@ -106,7 +104,7 @@ void RestrictionParser::ReadRestrictionExceptions(lua_State *lua_state)
} }
mapbox::util::optional<InputRestrictionContainer> mapbox::util::optional<InputRestrictionContainer>
RestrictionParser::TryParse(lua_State *lua_state, osmium::Relation &relation) const RestrictionParser::TryParse(osmium::Relation &relation) const
{ {
// return if turn restrictions should be ignored // return if turn restrictions should be ignored
if (!use_turn_restrictions) if (!use_turn_restrictions)

3
Extractor/RestrictionParser.h
View File

@ -46,8 +46,7 @@ class RestrictionParser
public: public:
// RestrictionParser(ScriptingEnvironment &scripting_environment); // RestrictionParser(ScriptingEnvironment &scripting_environment);
RestrictionParser(lua_State *lua_state); RestrictionParser(lua_State *lua_state);
mapbox::util::optional<InputRestrictionContainer> TryParse(lua_State *lua_state, mapbox::util::optional<InputRestrictionContainer> TryParse(osmium::Relation &relation) const;
osmium::Relation &relation) const;
private: private:
void ReadUseRestrictionsSetting(lua_State *lua_state); void ReadUseRestrictionsSetting(lua_State *lua_state);