diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-02-13 17:02:44 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:37:26 +0300 |
| commit | a2524383f6299b0deedbcf4a748311143a4d4b5f (patch) | |
| tree | 272ee361526ee59a9b56c12997195071a07fedb8 /generator | |
| parent | 714a7e1a371f440da30898d8b9db4a9187b63cfa (diff) | |
PR routing fixes
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/routing_generator.cpp | 30 | ||||
| -rw-r--r-- | generator/routing_generator.hpp | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp index 0eedbe71a0..3a33422cc7 100644 --- a/generator/routing_generator.cpp +++ b/generator/routing_generator.cpp @@ -4,17 +4,10 @@ #include "borders_loader.hpp" #include "gen_mwm_info.hpp" -#include "../3party/osrm/osrm-backend/DataStructures/EdgeBasedNodeData.h" -#include "../3party/osrm/osrm-backend/DataStructures/QueryEdge.h" -#include "../3party/osrm/osrm-backend/DataStructures/RawRouteData.h" - -#include "../base/logging.hpp" - -#include "../coding/file_container.hpp" -#include "../coding/read_write_utils.hpp" -#include "../coding/internal/file_data.hpp" - -#include "../geometry/distance_on_sphere.hpp" +#include "../routing/osrm2feature_map.hpp" +#include "../routing/osrm_data_facade.hpp" +#include "../routing/osrm_router.hpp" +#include "../routing/cross_routing_context.hpp" #include "../indexer/index.hpp" #include "../indexer/classificator_loader.hpp" @@ -22,13 +15,20 @@ #include "../indexer/ftypes_matcher.hpp" #include "../indexer/mercator.hpp" -#include "../routing/osrm2feature_map.hpp" -#include "../routing/osrm_data_facade.hpp" -#include "../routing/osrm_router.hpp" -#include "../routing/cross_routing_context.hpp" +#include "../geometry/distance_on_sphere.hpp" + +#include "../coding/file_container.hpp" +#include "../coding/read_write_utils.hpp" +#include "../coding/internal/file_data.hpp" + +#include "../base/logging.hpp" #include "../std/fstream.hpp" +#include "../3party/osrm/osrm-backend/DataStructures/EdgeBasedNodeData.h" +#include "../3party/osrm/osrm-backend/DataStructures/QueryEdge.h" +#include "../3party/osrm/osrm-backend/DataStructures/RawRouteData.h" + namespace routing { diff --git a/generator/routing_generator.hpp b/generator/routing_generator.hpp index b5cfe575a8..78a59e4518 100644 --- a/generator/routing_generator.hpp +++ b/generator/routing_generator.hpp @@ -2,8 +2,8 @@ #include "../std/string.hpp" #include "../std/vector.hpp" - #include "../std/set.hpp" + namespace routing { |