From 801cc726917a01f0d0fe5f3b054904878d499b95 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Thu, 2 Jun 2016 14:43:27 +0200 Subject: [PATCH] Sync with Clang38 Format --- include/engine/api/route_api.hpp | 11 +++++------ include/engine/datafacade/internal_datafacade.hpp | 2 +- include/util/packed_vector.hpp | 2 +- src/storage/storage.cpp | 2 +- unit_tests/mocks/mock_datafacade.hpp | 5 +---- unit_tests/util/packed_vector.cpp | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp index 138a75baf..c76ec9fd6 100644 --- a/include/engine/api/route_api.hpp +++ b/include/engine/api/route_api.hpp @@ -207,12 +207,11 @@ class RouteAPI : public BaseAPI durations.values.push_back(step.duration); distances.values.push_back(step.distance); }); - std::for_each( - leg_geometry.osm_node_ids.begin(), - leg_geometry.osm_node_ids.end(), - [this, &nodes](const OSMNodeID &node_id) { - nodes.values.push_back(static_cast(node_id)); - }); + std::for_each(leg_geometry.osm_node_ids.begin(), + leg_geometry.osm_node_ids.end(), + [this, &nodes](const OSMNodeID &node_id) { + nodes.values.push_back(static_cast(node_id)); + }); util::json::Object annotation; annotation.values["distance"] = std::move(distances); annotation.values["duration"] = std::move(durations); diff --git a/include/engine/datafacade/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp index a5732b817..236503f28 100644 --- a/include/engine/datafacade/internal_datafacade.hpp +++ b/include/engine/datafacade/internal_datafacade.hpp @@ -17,6 +17,7 @@ #include "engine/geospatial_query.hpp" #include "util/graph_loader.hpp" #include "util/io.hpp" +#include "util/packed_vector.hpp" #include "util/range_table.hpp" #include "util/rectangle.hpp" #include "util/shared_memory_vector_wrapper.hpp" @@ -24,7 +25,6 @@ #include "util/static_graph.hpp" #include "util/static_rtree.hpp" #include "util/typedefs.hpp" -#include "util/packed_vector.hpp" #include "osrm/coordinate.hpp" diff --git a/include/util/packed_vector.hpp b/include/util/packed_vector.hpp index 3083d4314..2874ed190 100644 --- a/include/util/packed_vector.hpp +++ b/include/util/packed_vector.hpp @@ -1,8 +1,8 @@ #ifndef PACKED_VECTOR_HPP #define PACKED_VECTOR_HPP -#include "util/typedefs.hpp" #include "util/shared_memory_vector_wrapper.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp index 9144bfb2f..533372de7 100644 --- a/src/storage/storage.cpp +++ b/src/storage/storage.cpp @@ -14,13 +14,13 @@ #include "util/exception.hpp" #include "util/fingerprint.hpp" #include "util/io.hpp" +#include "util/packed_vector.hpp" #include "util/range_table.hpp" #include "util/shared_memory_vector_wrapper.hpp" #include "util/simple_logger.hpp" #include "util/static_graph.hpp" #include "util/static_rtree.hpp" #include "util/typedefs.hpp" -#include "util/packed_vector.hpp" #ifdef __linux__ #include diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp index b6915529a..c6fd567ce 100644 --- a/unit_tests/mocks/mock_datafacade.hpp +++ b/unit_tests/mocks/mock_datafacade.hpp @@ -50,10 +50,7 @@ class MockDataFacade final : public engine::datafacade::BaseDataFacade { return {util::FixedLongitude{0}, util::FixedLatitude{0}}; } - OSMNodeID GetOSMNodeIDOfNode(const unsigned /* id */) const override - { - return OSMNodeID{0}; - } + OSMNodeID GetOSMNodeIDOfNode(const unsigned /* id */) const override { return OSMNodeID{0}; } bool EdgeIsCompressed(const unsigned /* id */) const { return false; } unsigned GetGeometryIndexForEdgeID(const unsigned /* id */) const override { diff --git a/unit_tests/util/packed_vector.cpp b/unit_tests/util/packed_vector.cpp index 46c65204f..6c723a6e4 100644 --- a/unit_tests/util/packed_vector.cpp +++ b/unit_tests/util/packed_vector.cpp @@ -1,8 +1,8 @@ #include "util/packed_vector.hpp" #include "util/typedefs.hpp" -#include #include +#include BOOST_AUTO_TEST_SUITE(packed_vector_test)