From 1e9e420d91b798ef350a203a03f27dc932aac8cc Mon Sep 17 00:00:00 2001 From: karenzshea Date: Fri, 3 Feb 2017 17:24:34 +0100 Subject: [PATCH] clang format --- include/engine/api/route_parameters.hpp | 11 +++++------ include/server/api/route_parameters_grammar.hpp | 3 ++- unit_tests/server/parameters_parser.cpp | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/engine/api/route_parameters.hpp b/include/engine/api/route_parameters.hpp index bb0a44c51..c43ea6a73 100644 --- a/include/engine/api/route_parameters.hpp +++ b/include/engine/api/route_parameters.hpp @@ -120,8 +120,9 @@ struct RouteParameters : public BaseParameters const boost::optional continue_straight_, Args... args_) : BaseParameters{std::forward(args_)...}, steps{steps_}, alternatives{alternatives_}, - annotations_type{annotations_}, annotations{annotations_ == AnnotationsType::None ? false : true}, geometries{geometries_}, - overview{overview_}, continue_straight{continue_straight_} + annotations_type{annotations_}, + annotations{annotations_ == AnnotationsType::None ? false : true}, + geometries{geometries_}, overview{overview_}, continue_straight{continue_straight_} { } @@ -136,8 +137,7 @@ struct RouteParameters : public BaseParameters bool IsValid() const { return coordinates.size() >= 2 && BaseParameters::IsValid(); } }; -inline bool operator&(RouteParameters::AnnotationsType lhs, - RouteParameters::AnnotationsType rhs) +inline bool operator&(RouteParameters::AnnotationsType lhs, RouteParameters::AnnotationsType rhs) { return static_cast( static_cast>(lhs) & @@ -153,11 +153,10 @@ inline RouteParameters::AnnotationsType operator|(RouteParameters::AnnotationsTy } inline RouteParameters::AnnotationsType operator|=(RouteParameters::AnnotationsType lhs, - RouteParameters::AnnotationsType rhs) + RouteParameters::AnnotationsType rhs) { return lhs = lhs | rhs; } - } } } diff --git a/include/server/api/route_parameters_grammar.hpp b/include/server/api/route_parameters_grammar.hpp index 32b8deb13..28e7e9605 100644 --- a/include/server/api/route_parameters_grammar.hpp +++ b/include/server/api/route_parameters_grammar.hpp @@ -45,7 +45,8 @@ struct RouteParametersGrammar : public BaseParametersGrammargeometries); - BOOST_CHECK_EQUAL(result_15->annotations_type == RouteParameters::AnnotationsType::Duration, true); + BOOST_CHECK_EQUAL(result_15->annotations_type == RouteParameters::AnnotationsType::Duration, + true); BOOST_CHECK_EQUAL(result_15->annotations, true); // parse multiple annotations correctly