From 2cde9cd785b8fc724decddb3666e0afbf03b7845 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Thu, 28 Mar 2019 12:17:57 +0300 Subject: [PATCH] [routing] Added necessary libs to routing common cmake list and corrected include orders. --- routing_common/CMakeLists.txt | 2 +- routing_common/bicycle_model.cpp | 6 +++--- routing_common/car_model.cpp | 4 ++-- routing_common/pedestrian_model.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/routing_common/CMakeLists.txt b/routing_common/CMakeLists.txt index aa667bdae3..3cb319eeac 100644 --- a/routing_common/CMakeLists.txt +++ b/routing_common/CMakeLists.txt @@ -10,7 +10,7 @@ set( bicycle_model.hpp car_model.cpp car_model.hpp - car_model_coefs.hpp + car_model_coefs.hpp # This file is generated by running ../configure.sh script. maxspeed_conversion.cpp maxspeed_conversion.hpp num_mwm_id.hpp diff --git a/routing_common/bicycle_model.cpp b/routing_common/bicycle_model.cpp index b65a0533db..756fd057df 100644 --- a/routing_common/bicycle_model.cpp +++ b/routing_common/bicycle_model.cpp @@ -1,12 +1,12 @@ #include "routing_common/bicycle_model.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" + #include "base/assert.hpp" #include "base/macros.hpp" #include "base/logging.hpp" -#include "indexer/classificator.hpp" -#include "indexer/feature.hpp" - using namespace routing; using namespace std; diff --git a/routing_common/car_model.cpp b/routing_common/car_model.cpp index 9bec801045..b3a079623b 100644 --- a/routing_common/car_model.cpp +++ b/routing_common/car_model.cpp @@ -1,10 +1,10 @@ #include "routing_common/car_model.hpp" #include "routing_common/car_model_coefs.hpp" -#include "base/macros.hpp" - #include "indexer/classificator.hpp" +#include "base/macros.hpp" + #include #include diff --git a/routing_common/pedestrian_model.cpp b/routing_common/pedestrian_model.cpp index f75b502d65..bc098ac65c 100644 --- a/routing_common/pedestrian_model.cpp +++ b/routing_common/pedestrian_model.cpp @@ -1,12 +1,12 @@ #include "routing_common/pedestrian_model.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" + #include "base/assert.hpp" #include "base/macros.hpp" #include "base/logging.hpp" -#include "indexer/classificator.hpp" -#include "indexer/feature.hpp" - using namespace routing; using namespace std;