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

Removing superflous inline statements

Browse Source
This commit is contained in:
DennisOSRM 2013-02-22 14:31:49 +01:00
parent 313b93169d
commit ae8e51074e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Extractor/BaseParser.cpp
View File

@ -71,7 +71,7 @@ void BaseParser::report_errors(lua_State *L, const int status) const {
} }
} }
inline void BaseParser::ParseNodeInLua(ImportNode& n, lua_State* localLuaState) { void BaseParser::ParseNodeInLua(ImportNode& n, lua_State* localLuaState) {
try { try {
luabind::call_function<int>( localLuaState, "node_function", boost::ref(n) ); luabind::call_function<int>( localLuaState, "node_function", boost::ref(n) );
} catch (const luabind::error &er) { } catch (const luabind::error &er) {
@ -81,7 +81,7 @@ inline void BaseParser::ParseNodeInLua(ImportNode& n, lua_State* localLuaState)
} }
} }
inline void BaseParser::ParseWayInLua(ExtractionWay& w, lua_State* localLuaState) { void BaseParser::ParseWayInLua(ExtractionWay& w, lua_State* localLuaState) {
try { try {
luabind::call_function<int>( localLuaState, "way_function", boost::ref(w), w.path.size() ); luabind::call_function<int>( localLuaState, "way_function", boost::ref(w), w.path.size() );
} catch (const luabind::error &er) { } catch (const luabind::error &er) {
@ -91,7 +91,7 @@ inline void BaseParser::ParseWayInLua(ExtractionWay& w, lua_State* localLuaState
} }
} }
inline bool BaseParser::ShouldIgnoreRestriction(const std::string& except_tag_string) const { bool BaseParser::ShouldIgnoreRestriction(const std::string& except_tag_string) const {
//should this restriction be ignored? yes if there's an overlap between: //should this restriction be ignored? yes if there's an overlap between:
//a) the list of modes in the except tag of the restriction (except_tag_string), ex: except=bus;bicycle //a) the list of modes in the except tag of the restriction (except_tag_string), ex: except=bus;bicycle
//b) the lua profile defines a hierachy of modes, ex: [access, vehicle, bicycle] //b) the lua profile defines a hierachy of modes, ex: [access, vehicle, bicycle]

6
Extractor/BaseParser.h
View File

@ -39,14 +39,14 @@ public:
virtual bool ReadHeader() = 0; virtual bool ReadHeader() = 0;
virtual bool Parse() = 0; virtual bool Parse() = 0;
inline virtual void ParseNodeInLua(ImportNode& n, lua_State* luaStateForThread); virtual void ParseNodeInLua(ImportNode& n, lua_State* luaStateForThread);
inline virtual void ParseWayInLua(ExtractionWay& n, lua_State* luaStateForThread); virtual void ParseWayInLua(ExtractionWay& n, lua_State* luaStateForThread);
virtual void report_errors(lua_State *L, const int status) const; virtual void report_errors(lua_State *L, const int status) const;
protected: protected:
virtual void ReadUseRestrictionsSetting(); virtual void ReadUseRestrictionsSetting();
virtual void ReadRestrictionExceptions(); virtual void ReadRestrictionExceptions();
inline virtual bool ShouldIgnoreRestriction(const std::string& except_tag_string) const; virtual bool ShouldIgnoreRestriction(const std::string& except_tag_string) const;
ExtractorCallbacks* externalMemory; ExtractorCallbacks* externalMemory;
ScriptingEnvironment& scriptingEnvironment; ScriptingEnvironment& scriptingEnvironment;