diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-11-10 18:43:15 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-11-11 16:15:48 +0300 |
| commit | 2c18b35d9de42848854eba703bd0d58de057a1c3 (patch) | |
| tree | ac1e3e7184d093ed7eae1e544605fd8c79d50524 /generator | |
| parent | 1363334ec91a1ca0f0795d192097a1765208613f (diff) | |
Moving routing_serializer and restriction_loader to routing submodule.
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/generator_tests/restriction_collector_test.cpp | 2 | ||||
| -rw-r--r-- | generator/generator_tests/restriction_test.cpp | 3 | ||||
| -rw-r--r-- | generator/restriction_collector.hpp | 2 | ||||
| -rw-r--r-- | generator/restriction_generator.cpp | 2 | ||||
| -rw-r--r-- | generator/restriction_writer.cpp | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/generator/generator_tests/restriction_collector_test.cpp b/generator/generator_tests/restriction_collector_test.cpp index efa668c09b..aa886f7a2d 100644 --- a/generator/generator_tests/restriction_collector_test.cpp +++ b/generator/generator_tests/restriction_collector_test.cpp @@ -3,7 +3,7 @@ #include "generator/osm_id.hpp" #include "generator/restriction_collector.hpp" -#include "indexer/routing.hpp" +#include "routing/routing_serializer.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" #include "platform/platform_tests_support/scoped_file.hpp" diff --git a/generator/generator_tests/restriction_test.cpp b/generator/generator_tests/restriction_test.cpp index 711065b0a2..8973866e4d 100644 --- a/generator/generator_tests/restriction_test.cpp +++ b/generator/generator_tests/restriction_test.cpp @@ -6,9 +6,10 @@ #include "generator/restriction_collector.hpp" #include "generator/restriction_generator.hpp" +#include "routing/restriction_loader.hpp" + #include "indexer/index.hpp" #include "indexer/mwm_set.hpp" -#include "indexer/restriction_loader.hpp" #include "coding/file_name_utils.hpp" diff --git a/generator/restriction_collector.hpp b/generator/restriction_collector.hpp index 19444a0c52..8f6e60ae8d 100644 --- a/generator/restriction_collector.hpp +++ b/generator/restriction_collector.hpp @@ -1,6 +1,6 @@ #pragma once -#include "indexer/routing.hpp" +#include "routing/routing_serializer.hpp" #include "std/functional.hpp" #include "std/limits.hpp" diff --git a/generator/restriction_generator.cpp b/generator/restriction_generator.cpp index 3483b176fb..2a5eb1a4bf 100644 --- a/generator/restriction_generator.cpp +++ b/generator/restriction_generator.cpp @@ -12,8 +12,6 @@ #include "std/algorithm.hpp" -using namespace feature; - namespace routing { bool BuildRoadRestrictions(string const & mwmPath, string const & restrictionPath, diff --git a/generator/restriction_writer.cpp b/generator/restriction_writer.cpp index 636d0e3ce7..f8550f2549 100644 --- a/generator/restriction_writer.cpp +++ b/generator/restriction_writer.cpp @@ -4,7 +4,7 @@ #include "generator/osm_id.hpp" #include "generator/restriction_collector.hpp" -#include "indexer/routing.hpp" +#include "routing/routing_serializer.hpp" #include "base/logging.hpp" |