Moved mm_version.* into “platform” library.

9 files changed, 21 insertions, 29 deletions

diff --git a/routing/cross_mwm_router.hpp b/routing/cross_mwm_router.hpp
index ef9b94b613..6df20a05ea 100644
--- a/routing/cross_mwm_router.hpp
+++ b/routing/cross_mwm_router.hpp
@@ -2,7 +2,7 @@
 
 #include "osrm_engine.hpp"
 #include "router.hpp"
-#include "routing_mapping.h"
+#include "routing_mapping.hpp"
 
 #include "std/string.hpp"
 #include "std/vector.hpp"
diff --git a/routing/online_absent_fetcher.hpp b/routing/online_absent_fetcher.hpp
index 80fdcaa9b2..0a91cd841b 100644
--- a/routing/online_absent_fetcher.hpp
+++ b/routing/online_absent_fetcher.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "route.hpp"
-#include "router.hpp"
-#include "routing_mapping.h"
+#include "routing_mapping.hpp"
 
 #include "geometry/point2d.hpp"
 
@@ -11,6 +9,7 @@
 #include "std/string.hpp"
 #include "std/unique_ptr.hpp"
 
+
 namespace routing
 {
 using TCountryLocalFileFn = function<shared_ptr<platform::LocalCountryFile>(string const &)>;
diff --git a/routing/osrm_router.hpp b/routing/osrm_router.hpp
index d5b4a83317..2b2d098cc4 100644
--- a/routing/osrm_router.hpp
+++ b/routing/osrm_router.hpp
@@ -1,23 +1,15 @@
 #pragma once
 
-#include "routing/osrm2feature_map.hpp"
 #include "routing/osrm_data_facade.hpp"
 #include "routing/osrm_engine.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 "routing/routing_mapping.hpp"
 
 
 namespace feature { class TypesHolder; }
 
+class Index;
 struct RawRouteData;
 struct PhantomNode;
 struct PathData;
diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp
index 81dc0c3fbd..b937e5eb16 100644
--- a/routing/road_graph_router.cpp
+++ b/routing/road_graph_router.cpp
@@ -10,10 +10,10 @@
 #include "indexer/feature.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
-#include "indexer/mwm_version.hpp"
 
 #include "platform/country_file.hpp"
 #include "platform/local_country_file.hpp"
+#include "platform/mwm_version.hpp"
 
 #include "geometry/distance.hpp"
 
diff --git a/routing/routing.pro b/routing/routing.pro
index 9348f704ea..32c6f342a9 100644
--- a/routing/routing.pro
+++ b/routing/routing.pro
@@ -68,7 +68,7 @@ HEADERS += \
     router.hpp \
     router_delegate.hpp \
     routing_algorithm.hpp \
-    routing_mapping.h \
+    routing_mapping.hpp \
     routing_session.hpp \
     routing_settings.hpp \
     turns.hpp \
diff --git a/routing/routing_mapping.cpp b/routing/routing_mapping.cpp
index 8adeb0d66c..578cec1025 100644
--- a/routing/routing_mapping.cpp
+++ b/routing/routing_mapping.cpp
@@ -1,23 +1,24 @@
-#include "routing/routing_mapping.h"
+#include "routing_mapping.hpp"
 
 #include "routing/cross_routing_context.hpp"
 #include "routing/osrm2feature_map.hpp"
 #include "routing/osrm_data_facade.hpp"
 
-#include "base/logging.hpp"
+#include "platform/country_file.hpp"
+#include "platform/local_country_file.hpp"
+#include "platform/mwm_version.hpp"
+#include "platform/platform.hpp"
 
 #include "coding/reader_wrapper.hpp"
 
-#include "indexer/mwm_version.hpp"
+#include "base/logging.hpp"
 
-#include "platform/country_file.hpp"
-#include "platform/local_country_file.hpp"
-#include "platform/platform.hpp"
 
 using platform::CountryFile;
 using platform::LocalCountryFile;
 
-namespace {
+namespace
+{
 /*!
  * \brief CheckMwmConsistency checks versions of mwm and routing files.
  * \param localFile reference to country file we need to check.
diff --git a/routing/routing_mapping.h b/routing/routing_mapping.hpp
index e81cba8bdd..e81cba8bdd 100644
--- a/routing/routing_mapping.h
+++ b/routing/routing_mapping.hpp
diff --git a/routing/routing_tests/routing_mapping_test.cpp b/routing/routing_tests/routing_mapping_test.cpp
index 8a53732534..2ab460f6f4 100644
--- a/routing/routing_tests/routing_mapping_test.cpp
+++ b/routing/routing_tests/routing_mapping_test.cpp
@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
 #include "indexer/indexer_tests/test_mwm_set.hpp"
 
-#include "routing/routing_mapping.h"
-
 #include "map/feature_vec_model.hpp"
 
+#include "routing/routing_mapping.hpp"
+
 #include "platform/country_file.hpp"
 #include "platform/local_country_file.hpp"
 #include "platform/platform.hpp"
diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp
index 3f2f21e0e1..ac205460a0 100644
--- a/routing/turns_generator.cpp
+++ b/routing/turns_generator.cpp
@@ -1,8 +1,7 @@
-#include "routing/routing_mapping.h"
-#include "routing/turns_generator.hpp"
-#include "routing/car_model.hpp"
+#include "turns_generator.hpp"
 
-#include "search/house_detector.hpp"
+#include "routing/car_model.hpp"
+#include "routing/routing_mapping.hpp"
 
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/scales.hpp"
@@ -16,6 +15,7 @@
 #include "std/numeric.hpp"
 #include "std/string.hpp"
 
+
 using namespace routing;
 using namespace routing::turns;