From cbfbcdcff5f9e45161f134e34cc3f33aabe92c1f Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 20 Nov 2014 10:46:14 +0100 Subject: [PATCH] reformat RestrictionParser --- Extractor/RestrictionParser.cpp | 9 ++++++--- Extractor/RestrictionParser.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Extractor/RestrictionParser.cpp b/Extractor/RestrictionParser.cpp index ac0931a24..4ed2b4a82 100644 --- a/Extractor/RestrictionParser.cpp +++ b/Extractor/RestrictionParser.cpp @@ -41,7 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -namespace { +namespace +{ int lua_error_callback(lua_State *L) { luabind::object error_msg(luabind::from_stack(L, -1)); @@ -104,7 +105,8 @@ void RestrictionParser::ReadRestrictionExceptions(lua_State *lua_state) } } -mapbox::util::optional RestrictionParser::TryParse(lua_State *lua_state, osmium::Relation &relation) const +mapbox::util::optional +RestrictionParser::TryParse(lua_State *lua_state, osmium::Relation &relation) const { // return if turn restrictions should be ignored if (!use_turn_restrictions) @@ -210,7 +212,8 @@ mapbox::util::optional RestrictionParser::TryParse(lu // SimpleLogger().Write() << (restriction_container.restriction.flags.is_only ? "only" : "no") // << "-restriction " // << "<" << restriction_container.restriction.from.node << "->" - // << restriction_container.restriction.via.node << "->" << restriction_container.restriction.to.node + // << restriction_container.restriction.via.node << "->" << + // restriction_container.restriction.to.node // << ">"; return mapbox::util::optional(restriction_container); diff --git a/Extractor/RestrictionParser.h b/Extractor/RestrictionParser.h index 1cfe2aca5..ddf838f4b 100644 --- a/Extractor/RestrictionParser.h +++ b/Extractor/RestrictionParser.h @@ -46,7 +46,8 @@ class RestrictionParser public: // RestrictionParser(ScriptingEnvironment &scripting_environment); RestrictionParser(lua_State *lua_state); - mapbox::util::optional TryParse(lua_State *lua_state, osmium::Relation& relation) const; + mapbox::util::optional TryParse(lua_State *lua_state, + osmium::Relation &relation) const; private: void ReadUseRestrictionsSetting(lua_State *lua_state);