[std] Use new include style for coding, fixes.

5 files changed, 21 insertions, 8 deletions

diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp
index e1e795a39e..52db1e36d8 100644
--- a/indexer/drawing_rules.hpp
+++ b/indexer/drawing_rules.hpp
@@ -12,6 +12,7 @@
 #include <array>
 #include <iostream>
 #include <map>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -63,7 +64,7 @@ namespace drule
     bool TestFeature(FeatureType & ft, int zoom) const;
 
     // Set runtime feature style selector
-    void SetSelector(unique_ptr<ISelector> && selector);
+    void SetSelector(std::unique_ptr<ISelector> && selector);
   };
 
   class RulesHolder
diff --git a/indexer/feature_altitude.hpp b/indexer/feature_altitude.hpp
index 48357affeb..da3a858c05 100644
--- a/indexer/feature_altitude.hpp
+++ b/indexer/feature_altitude.hpp
@@ -11,6 +11,7 @@
 
 #include <cstdint>
 #include <limits>
+#include <string>
 #include <vector>
 
 namespace feature
@@ -100,7 +101,7 @@ public:
   }
 
   template <class TSource>
-  bool Deserialize(TAltitude minAltitude, size_t pointCount, string const & countryFileName,
+  bool Deserialize(TAltitude minAltitude, size_t pointCount, std::string const & countryFileName,
                    uint32_t featureId, TSource & src)
   {
     ASSERT_NOT_EQUAL(pointCount, 0, ());
diff --git a/indexer/feature_processor.hpp b/indexer/feature_processor.hpp
index 794186e1db..10770e77d0 100644
--- a/indexer/feature_processor.hpp
+++ b/indexer/feature_processor.hpp
@@ -5,6 +5,8 @@
 #include "coding/file_reader.hpp"
 #include "coding/file_container.hpp"
 
+#include <memory>
+#include <string>
 #include <utility>
 
 namespace feature
@@ -17,8 +19,8 @@ void ForEachFromDat(ModelReaderPtr reader, ToDo && toDo)
 }
 
 template <class ToDo>
-void ForEachFromDat(string const & fPath, ToDo && toDo)
+void ForEachFromDat(std::string const & fPath, ToDo && toDo)
 {
-  ForEachFromDat(make_unique<FileReader>(fPath), std::forward<ToDo>(toDo));
+  ForEachFromDat(std::make_unique<FileReader>(fPath), std::forward<ToDo>(toDo));
 }
 }  // namespace feature
diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp
index 9a95f24ecc..be7cd373ac 100644
--- a/indexer/indexer_tests/rank_table_test.cpp
+++ b/indexer/indexer_tests/rank_table_test.cpp
@@ -19,9 +19,13 @@
 
 #include "defines.hpp"
 
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 
+using namespace std;
+
 namespace
 {
 void TestTable(vector<uint8_t> const & ranks, search::RankTable const & table)
diff --git a/indexer/indexer_tests/test_mwm_set.hpp b/indexer/indexer_tests/test_mwm_set.hpp
index 599f507555..12acf75df7 100644
--- a/indexer/indexer_tests/test_mwm_set.hpp
+++ b/indexer/indexer_tests/test_mwm_set.hpp
@@ -4,6 +4,11 @@
 
 #include "platform/country_file.hpp"
 #include "platform/local_country_file.hpp"
+#include "platform/mwm_version.hpp"
+
+#include "geometry/rect2d.hpp"
+
+#include <memory>
 
 using platform::CountryFile;
 using platform::LocalCountryFile;
@@ -16,19 +21,19 @@ class TestMwmSet : public MwmSet
 protected:
   /// @name MwmSet overrides
   //@{
-  unique_ptr<MwmInfo> CreateInfo(platform::LocalCountryFile const & localFile) const override
+  std::unique_ptr<MwmInfo> CreateInfo(platform::LocalCountryFile const & localFile) const override
   {
     int const n = localFile.GetCountryName()[0] - '0';
-    unique_ptr<MwmInfo> info(new MwmInfo());
+    std::unique_ptr<MwmInfo> info(new MwmInfo());
     info->m_maxScale = n;
     info->m_bordersRect = m2::RectD(0, 0, 1, 1);
     info->m_version.SetFormat(version::Format::lastFormat);
     return info;
   }
 
-  unique_ptr<MwmValueBase> CreateValue(MwmInfo &) const override
+  std::unique_ptr<MwmValueBase> CreateValue(MwmInfo &) const override
   {
-    return make_unique<MwmValueBase>();
+    return std::make_unique<MwmValueBase>();
   }
   //@}
 };