diff --git a/Extractor/BaseParser.cpp b/Extractor/BaseParser.cpp index d57c4c5cf..14c6dd24d 100644 --- a/Extractor/BaseParser.cpp +++ b/Extractor/BaseParser.cpp @@ -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 { luabind::call_function( localLuaState, "node_function", boost::ref(n) ); } 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 { luabind::call_function( localLuaState, "way_function", boost::ref(w), w.path.size() ); } 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: //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] @@ -110,4 +110,4 @@ inline bool BaseParser::ShouldIgnoreRestriction(const std::string& except_tag_st } } return false; -} \ No newline at end of file +} diff --git a/Extractor/BaseParser.h b/Extractor/BaseParser.h index 891af320b..f4904fc01 100644 --- a/Extractor/BaseParser.h +++ b/Extractor/BaseParser.h @@ -39,14 +39,14 @@ public: virtual bool ReadHeader() = 0; virtual bool Parse() = 0; - inline virtual void ParseNodeInLua(ImportNode& n, lua_State* luaStateForThread); - inline virtual void ParseWayInLua(ExtractionWay& n, lua_State* luaStateForThread); + virtual void ParseNodeInLua(ImportNode& n, lua_State* luaStateForThread); + virtual void ParseWayInLua(ExtractionWay& n, lua_State* luaStateForThread); virtual void report_errors(lua_State *L, const int status) const; protected: virtual void ReadUseRestrictionsSetting(); 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; ScriptingEnvironment& scriptingEnvironment;