diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-09-05 14:52:53 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-09-08 12:49:55 +0300 |
| commit | 037d271dbef8ef1dc5810623212adce25c151f35 (patch) | |
| tree | f01df667ebf111f9563376aab4b54be35ce5142c /routing | |
| parent | c7c726975c1ce682f94714981adc32fb38788a1e (diff) | |
git-clang-format
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/base/followed_polyline.hpp | 1 | ||||
| -rw-r--r-- | routing/road_graph_router.cpp | 2 | ||||
| -rw-r--r-- | routing/route.hpp | 24 | ||||
| -rw-r--r-- | routing/routing_session.cpp | 6 |
4 files changed, 6 insertions, 27 deletions
diff --git a/routing/base/followed_polyline.hpp b/routing/base/followed_polyline.hpp index 66d3fd8a85..ebf2a87d78 100644 --- a/routing/base/followed_polyline.hpp +++ b/routing/base/followed_polyline.hpp @@ -24,7 +24,6 @@ public: m2::PolylineD const & GetPolyline() const { return m_poly; } vector<double> const & GetSegDistanceM() const { return m_segDistance; } - double GetTotalDistanceM() const; double GetDistanceFromBeginM() const; double GetDistanceToEndM() const; diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index 1b11626688..dddfb17fc1 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -9,8 +9,8 @@ #include "coding/reader_wrapper.hpp" -#include "indexer/feature_altitude.hpp" #include "indexer/feature.hpp" +#include "indexer/feature_altitude.hpp" #include "indexer/ftypes_matcher.hpp" #include "indexer/index.hpp" diff --git a/routing/route.hpp b/routing/route.hpp index 55aeab4eee..7c1fdb294a 100644 --- a/routing/route.hpp +++ b/routing/route.hpp @@ -55,26 +55,10 @@ public: Update(); } - inline void SwapTurnInstructions(TTurns & v) - { - swap(m_turns, v); - } - - inline void SwapSectionTimes(TTimes & v) - { - swap(m_times, v); - } - - inline void SwapStreetNames(TStreets & v) - { - swap(m_streets, v); - } - - inline void SwapAltitudes(feature::TAltitudes & v) - { - swap(m_altitudes, v); - } - + inline void SwapTurnInstructions(TTurns & v) { swap(m_turns, v); } + inline void SwapSectionTimes(TTimes & v) { swap(m_times, v); } + inline void SwapStreetNames(TStreets & v) { swap(m_streets, v); } + inline void SwapAltitudes(feature::TAltitudes & v) { swap(m_altitudes, v); } uint32_t GetTotalTimeSec() const; uint32_t GetCurrentTimeToEndSec() const; diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index bc57f7f772..dbdb08c515 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -523,11 +523,7 @@ void RoutingSession::EmitCloseRoutingEvent() const alohalytics::Location::FromLatLon(lastGoodPoint.lat, lastGoodPoint.lon)); } -bool RoutingSession::HasRouteAltitudeImpl() const -{ - return !m_route.GetAltitudes().empty(); -} - +bool RoutingSession::HasRouteAltitudeImpl() const { return !m_route.GetAltitudes().empty(); } bool RoutingSession::HasRouteAltitude() const { threads::MutexGuard guard(m_routeSessionMutex); |