diff options
author | Sergey Yershov <yershov@corp.mail.ru> | 2015-04-10 12:38:28 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:45:55 +0300 |
commit | 8ef48bc946824a40e0f964ccf7d51727a0f0d00e (patch) | |
tree | 8e686988ae682e0ad51e322276dcebe8131ac424 | |
parent | 8af9575c0f3baa1467b73b45ab25e23bf3cfc9d6 (diff) |
Fix include path for routing
-rw-r--r-- | routing/cross_routing_context.cpp | 4 | ||||
-rw-r--r-- | routing/cross_routing_context.hpp | 8 | ||||
-rw-r--r-- | routing/osrm2feature_map.cpp | 28 | ||||
-rw-r--r-- | routing/osrm2feature_map.hpp | 26 | ||||
-rw-r--r-- | routing/osrm_data_facade.hpp | 26 | ||||
-rw-r--r-- | routing/osrm_online_router.cpp | 20 | ||||
-rw-r--r-- | routing/osrm_online_router.hpp | 4 | ||||
-rw-r--r-- | routing/osrm_router.cpp | 42 | ||||
-rw-r--r-- | routing/osrm_router.hpp | 34 | ||||
-rw-r--r-- | routing/route.cpp | 16 | ||||
-rw-r--r-- | routing/route.hpp | 8 | ||||
-rw-r--r-- | routing/router.hpp | 6 | ||||
-rw-r--r-- | routing/routing_mapping.cpp | 16 | ||||
-rw-r--r-- | routing/routing_tests/cross_routing_tests.cpp | 8 | ||||
-rw-r--r-- | routing/routing_tests/osrm_router_test.cpp | 24 | ||||
-rw-r--r-- | routing/routing_tests/vehicle_model_test.cpp | 12 | ||||
-rw-r--r-- | routing/turns.cpp | 2 | ||||
-rw-r--r-- | routing/turns.hpp | 6 | ||||
-rw-r--r-- | routing/vehicle_model.cpp | 14 | ||||
-rw-r--r-- | routing/vehicle_model.hpp | 10 |
20 files changed, 157 insertions, 157 deletions
diff --git a/routing/cross_routing_context.cpp b/routing/cross_routing_context.cpp index b0bcbf53d4..34bbae6a6c 100644 --- a/routing/cross_routing_context.cpp +++ b/routing/cross_routing_context.cpp @@ -1,6 +1,6 @@ -#include "cross_routing_context.hpp" +#include "routing/cross_routing_context.hpp" -#include "../indexer/point_to_int64.hpp" +#include "indexer/point_to_int64.hpp" namespace routing { diff --git a/routing/cross_routing_context.hpp b/routing/cross_routing_context.hpp index 1990b7b83f..fbf592bf0a 100644 --- a/routing/cross_routing_context.hpp +++ b/routing/cross_routing_context.hpp @@ -1,11 +1,11 @@ #pragma once -#include "../coding/file_container.hpp" +#include "coding/file_container.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/string.hpp" -#include "../std/vector.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" namespace routing { diff --git a/routing/osrm2feature_map.cpp b/routing/osrm2feature_map.cpp index 8e76e250b5..7216205799 100644 --- a/routing/osrm2feature_map.cpp +++ b/routing/osrm2feature_map.cpp @@ -1,22 +1,22 @@ -#include "osrm2feature_map.hpp" +#include "routing/osrm2feature_map.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../coding/file_name_utils.hpp" -#include "../coding/internal/file_data.hpp" -#include "../coding/read_write_utils.hpp" -#include "../coding/varint.hpp" +#include "coding/file_name_utils.hpp" +#include "coding/internal/file_data.hpp" +#include "coding/read_write_utils.hpp" +#include "coding/varint.hpp" -#include "../base/assert.hpp" -#include "../base/logging.hpp" -#include "../base/math.hpp" -#include "../base/scope_guard.hpp" +#include "base/assert.hpp" +#include "base/logging.hpp" +#include "base/math.hpp" +#include "base/scope_guard.hpp" -#include "../std/fstream.hpp" -#include "../std/sstream.hpp" -#include "../std/unordered_map.hpp" +#include "std/fstream.hpp" +#include "std/sstream.hpp" +#include "std/unordered_map.hpp" -#include "../3party/succinct/mapper.hpp" +#include "3party/succinct/mapper.hpp" namespace routing diff --git a/routing/osrm2feature_map.hpp b/routing/osrm2feature_map.hpp index 1e338cfe7c..741e6e8aca 100644 --- a/routing/osrm2feature_map.hpp +++ b/routing/osrm2feature_map.hpp @@ -1,25 +1,25 @@ #pragma once -#include "../coding/file_container.hpp" -#include "../coding/mmap_reader.hpp" +#include "coding/file_container.hpp" +#include "coding/mmap_reader.hpp" -#include "../indexer/features_offsets_table.hpp" +#include "indexer/features_offsets_table.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../base/scope_guard.hpp" +#include "base/scope_guard.hpp" -#include "../std/limits.hpp" -#include "../std/string.hpp" -#include "../std/unordered_map.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" +#include "std/limits.hpp" +#include "std/string.hpp" +#include "std/unordered_map.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" -#include "../3party/succinct/rs_bit_vector.hpp" +#include "3party/succinct/rs_bit_vector.hpp" -#include "../3party/succinct/elias_fano_compressed_list.hpp" +#include "3party/succinct/elias_fano_compressed_list.hpp" -#include "../defines.hpp" +#include "defines.hpp" namespace routing { diff --git a/routing/osrm_data_facade.hpp b/routing/osrm_data_facade.hpp index fd2fd10a83..b71b5919d8 100644 --- a/routing/osrm_data_facade.hpp +++ b/routing/osrm_data_facade.hpp @@ -1,23 +1,23 @@ #pragma once -#include "cross_routing_context.hpp" +#include "routing/cross_routing_context.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../coding/file_container.hpp" -#include "../coding/read_write_utils.hpp" +#include "coding/file_container.hpp" +#include "coding/read_write_utils.hpp" -#include "../base/bits.hpp" +#include "base/bits.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" -#include "../3party/succinct/elias_fano.hpp" -#include "../3party/succinct/elias_fano_compressed_list.hpp" -#include "../3party/succinct/gamma_vector.hpp" -#include "../3party/succinct/rs_bit_vector.hpp" -#include "../3party/succinct/mapper.hpp" -#include "../3party/osrm/osrm-backend/Server/DataStructures/BaseDataFacade.h" -#include "../3party/osrm/osrm-backend/DataStructures/TravelMode.h" +#include "3party/succinct/elias_fano.hpp" +#include "3party/succinct/elias_fano_compressed_list.hpp" +#include "3party/succinct/gamma_vector.hpp" +#include "3party/succinct/rs_bit_vector.hpp" +#include "3party/succinct/mapper.hpp" +#include "3party/osrm/osrm-backend/Server/DataStructures/BaseDataFacade.h" +#include "3party/osrm/osrm-backend/DataStructures/TravelMode.h" namespace routing { diff --git a/routing/osrm_online_router.cpp b/routing/osrm_online_router.cpp index af8abe4b35..e6335dc9bc 100644 --- a/routing/osrm_online_router.cpp +++ b/routing/osrm_online_router.cpp @@ -1,18 +1,18 @@ -#include "osrm_online_router.hpp" -#include "route.hpp" +#include "routing/osrm_online_router.hpp" +#include "routing/route.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/mercator.hpp" -#include "../platform/http_request.hpp" +#include "platform/http_request.hpp" -#include "../base/timer.hpp" -#include "../base/string_utils.hpp" -#include "../base/macros.hpp" -#include "../base/logging.hpp" +#include "base/timer.hpp" +#include "base/string_utils.hpp" +#include "base/macros.hpp" +#include "base/logging.hpp" -#include "../std/bind.hpp" +#include "std/bind.hpp" -#include "../3party/jansson/myjansson.hpp" +#include "3party/jansson/myjansson.hpp" namespace routing { diff --git a/routing/osrm_online_router.hpp b/routing/osrm_online_router.hpp index f192df8b28..113e47e11b 100644 --- a/routing/osrm_online_router.hpp +++ b/routing/osrm_online_router.hpp @@ -1,8 +1,8 @@ #pragma once -#include "router.hpp" +#include "routing/router.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" namespace downloader { class HttpRequest; } diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp index 7ed0ffe40d..4e762fb9bf 100644 --- a/routing/osrm_router.cpp +++ b/routing/osrm_router.cpp @@ -1,31 +1,31 @@ -#include "osrm_router.hpp" -#include "vehicle_model.hpp" +#include "routing/osrm_router.hpp" +#include "routing/vehicle_model.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../geometry/angles.hpp" -#include "../geometry/distance.hpp" -#include "../geometry/distance_on_sphere.hpp" +#include "geometry/angles.hpp" +#include "geometry/distance.hpp" +#include "geometry/distance_on_sphere.hpp" -#include "../indexer/ftypes_matcher.hpp" -#include "../indexer/mercator.hpp" -#include "../indexer/index.hpp" -#include "../indexer/scales.hpp" -#include "../indexer/search_string_utils.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/mercator.hpp" +#include "indexer/index.hpp" +#include "indexer/scales.hpp" +#include "indexer/search_string_utils.hpp" -#include "../coding/reader_wrapper.hpp" +#include "coding/reader_wrapper.hpp" -#include "../base/logging.hpp" -#include "../base/math.hpp" -#include "../base/scope_guard.hpp" -#include "../base/timer.hpp" +#include "base/logging.hpp" +#include "base/math.hpp" +#include "base/scope_guard.hpp" +#include "base/timer.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" -#include "../3party/osrm/osrm-backend/DataStructures/SearchEngineData.h" -#include "../3party/osrm/osrm-backend/Descriptors/DescriptionFactory.h" -#include "../3party/osrm/osrm-backend/RoutingAlgorithms/ShortestPathRouting.h" -#include "../3party/osrm/osrm-backend/RoutingAlgorithms/NToMManyToManyRouting.h" +#include "3party/osrm/osrm-backend/DataStructures/SearchEngineData.h" +#include "3party/osrm/osrm-backend/Descriptors/DescriptionFactory.h" +#include "3party/osrm/osrm-backend/RoutingAlgorithms/ShortestPathRouting.h" +#include "3party/osrm/osrm-backend/RoutingAlgorithms/NToMManyToManyRouting.h" namespace routing diff --git a/routing/osrm_router.hpp b/routing/osrm_router.hpp index 0ca5162e35..ad18c048f9 100644 --- a/routing/osrm_router.hpp +++ b/routing/osrm_router.hpp @@ -1,22 +1,22 @@ #pragma once -#include "osrm2feature_map.hpp" -#include "osrm_data_facade.hpp" -#include "route.hpp" -#include "router.hpp" -#include "routing_mapping.h" - -#include "../indexer/index.hpp" -#include "../base/mutex.hpp" - -#include "../std/atomic.hpp" -#include "../std/function.hpp" -#include "../std/numeric.hpp" -#include "../std/queue.hpp" -#include "../std/unordered_map.hpp" - -#include "../3party/osrm/osrm-backend/DataStructures/QueryEdge.h" -#include "../3party/osrm/osrm-backend/DataStructures/RawRouteData.h" +#include "routing/osrm2feature_map.hpp" +#include "routing/osrm_data_facade.hpp" +#include "routing/route.hpp" +#include "routing/router.hpp" +#include "routing/routing_mapping.h" + +#include "indexer/index.hpp" +#include "base/mutex.hpp" + +#include "std/atomic.hpp" +#include "std/function.hpp" +#include "std/numeric.hpp" +#include "std/queue.hpp" +#include "std/unordered_map.hpp" + +#include "3party/osrm/osrm-backend/DataStructures/QueryEdge.h" +#include "3party/osrm/osrm-backend/DataStructures/RawRouteData.h" namespace feature { class TypesHolder; } diff --git a/routing/route.cpp b/routing/route.cpp index ff979bb4a6..963f46f455 100644 --- a/routing/route.cpp +++ b/routing/route.cpp @@ -1,17 +1,17 @@ -#include "route.hpp" +#include "routing/route.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/mercator.hpp" -#include "../platform/location.hpp" +#include "platform/location.hpp" -#include "../geometry/angles.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/angles.hpp" +#include "geometry/point2d.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/numeric.hpp" +#include "std/numeric.hpp" -#include "../map/location_state.hpp" +#include "map/location_state.hpp" namespace routing diff --git a/routing/route.hpp b/routing/route.hpp index fbe9f3f3d7..80ff328e8b 100644 --- a/routing/route.hpp +++ b/routing/route.hpp @@ -1,11 +1,11 @@ #pragma once -#include "turns.hpp" +#include "routing/turns.hpp" -#include "../geometry/polyline2d.hpp" +#include "geometry/polyline2d.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" namespace location diff --git a/routing/router.hpp b/routing/router.hpp index 33a6019cd7..e4a4682a4f 100644 --- a/routing/router.hpp +++ b/routing/router.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/function.hpp" -#include "../std/string.hpp" +#include "std/function.hpp" +#include "std/string.hpp" namespace routing diff --git a/routing/routing_mapping.cpp b/routing/routing_mapping.cpp index 1c1fd42484..049a06cff7 100644 --- a/routing/routing_mapping.cpp +++ b/routing/routing_mapping.cpp @@ -1,16 +1,16 @@ -#include "routing_mapping.h" +#include "routing/routing_mapping.h" -#include "cross_routing_context.hpp" -#include "osrm2feature_map.hpp" -#include "osrm_data_facade.hpp" +#include "routing/cross_routing_context.hpp" +#include "routing/osrm2feature_map.hpp" +#include "routing/osrm_data_facade.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../coding/reader_wrapper.hpp" +#include "coding/reader_wrapper.hpp" -#include "../indexer/mwm_version.hpp" +#include "indexer/mwm_version.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" namespace routing { diff --git a/routing/routing_tests/cross_routing_tests.cpp b/routing/routing_tests/cross_routing_tests.cpp index d9157d7a32..c295756fe5 100644 --- a/routing/routing_tests/cross_routing_tests.cpp +++ b/routing/routing_tests/cross_routing_tests.cpp @@ -1,8 +1,8 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../routing/cross_routing_context.hpp" -#include "../../coding/reader.hpp" -#include "../../coding/writer.hpp" +#include "routing/cross_routing_context.hpp" +#include "coding/reader.hpp" +#include "coding/writer.hpp" namespace diff --git a/routing/routing_tests/osrm_router_test.cpp b/routing/routing_tests/osrm_router_test.cpp index 5bb0d0ab14..45a360a726 100644 --- a/routing/routing_tests/osrm_router_test.cpp +++ b/routing/routing_tests/osrm_router_test.cpp @@ -1,22 +1,22 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../osrm_router.hpp" +#include "routing/osrm_router.hpp" -#include "../../indexer/features_offsets_table.hpp" -#include "../../indexer/mercator.hpp" +#include "indexer/features_offsets_table.hpp" +#include "indexer/mercator.hpp" -#include "../../coding/file_writer.hpp" +#include "coding/file_writer.hpp" -#include "../../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../../defines.hpp" +#include "defines.hpp" -#include "../../base/scope_guard.hpp" +#include "base/scope_guard.hpp" -#include "../../std/bind.hpp" -#include "../../std/string.hpp" -#include "../../std/unique_ptr.hpp" -#include "../../std/vector.hpp" +#include "std/bind.hpp" +#include "std/string.hpp" +#include "std/unique_ptr.hpp" +#include "std/vector.hpp" using namespace routing; diff --git a/routing/routing_tests/vehicle_model_test.cpp b/routing/routing_tests/vehicle_model_test.cpp index 6a55150cf3..78b567d8ac 100644 --- a/routing/routing_tests/vehicle_model_test.cpp +++ b/routing/routing_tests/vehicle_model_test.cpp @@ -1,12 +1,12 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../vehicle_model.hpp" +#include "routing/vehicle_model.hpp" -#include "../../indexer/classificator.hpp" -#include "../../indexer/classificator_loader.hpp" -#include "../../indexer/feature.hpp" +#include "indexer/classificator.hpp" +#include "indexer/classificator_loader.hpp" +#include "indexer/feature.hpp" -#include "../../base/macros.hpp" +#include "base/macros.hpp" namespace diff --git a/routing/turns.cpp b/routing/turns.cpp index 44faae13f9..53b5f4056b 100644 --- a/routing/turns.cpp +++ b/routing/turns.cpp @@ -1,4 +1,4 @@ -#include "turns.hpp" +#include "routing/turns.hpp" namespace routing diff --git a/routing/turns.hpp b/routing/turns.hpp index a7a2b3491e..883bc3f60a 100644 --- a/routing/turns.hpp +++ b/routing/turns.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../std/string.hpp" -#include "../std/vector.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" namespace routing { diff --git a/routing/vehicle_model.cpp b/routing/vehicle_model.cpp index b90c71ecf9..5718f3a9ef 100644 --- a/routing/vehicle_model.cpp +++ b/routing/vehicle_model.cpp @@ -1,13 +1,13 @@ -#include "vehicle_model.hpp" +#include "routing/vehicle_model.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature.hpp" -#include "../indexer/ftypes_matcher.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/ftypes_matcher.hpp" -#include "../base/macros.hpp" +#include "base/macros.hpp" -#include "../std/limits.hpp" -#include "../std/initializer_list.hpp" +#include "std/limits.hpp" +#include "std/initializer_list.hpp" namespace routing diff --git a/routing/vehicle_model.hpp b/routing/vehicle_model.hpp index 178f3c26fc..86214463b7 100644 --- a/routing/vehicle_model.hpp +++ b/routing/vehicle_model.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../base/buffer_vector.hpp" +#include "base/buffer_vector.hpp" -#include "../std/unordered_map.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" -#include "../std/stdint.hpp" +#include "std/unordered_map.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" +#include "std/stdint.hpp" class Classificator; |