1 files changed, 22 insertions, 22 deletions

diff --git a/generator/osm_translator.hpp b/generator/osm_translator.hpp
index 24b6697b98..29e585a3c2 100644
--- a/generator/osm_translator.hpp
+++ b/generator/osm_translator.hpp
@@ -19,10 +19,10 @@
 #include "base/stl_add.hpp"
 #include "base/string_utils.hpp"
 
-#include "std/list.hpp"
-#include "std/type_traits.hpp"
-#include "std/unordered_set.hpp"
-#include "std/vector.hpp"
+#include <list>
+#include <type_traits>
+#include <unordered_set>
+#include <vector>
 
 namespace
 {
@@ -55,13 +55,13 @@ public:
   }
 
 protected:
-  static bool IsSkipRelation(string const & type)
+  static bool IsSkipRelation(std::string const & type)
   {
     /// @todo Skip special relation types.
     return (type == "multipolygon" || type == "bridge");
   }
 
-  bool IsKeyTagExists(string const & key) const
+  bool IsKeyTagExists(std::string const & key) const
   {
     for (auto const & p : m_current->m_tags)
       if (p.key == key)
@@ -69,7 +69,7 @@ protected:
     return false;
   }
 
-  void AddCustomTag(pair<string, string> const & p)
+  void AddCustomTag(pair<std::string, std::string> const & p)
   {
     m_current->AddTag(p.first, p.second);
   }
@@ -95,7 +95,7 @@ public:
 protected:
   void Process(RelationElement const & e) override
   {
-    string const & type = e.GetType();
+    std::string const & type = e.GetType();
     if (TBase::IsSkipRelation(type))
       return;
 
@@ -137,11 +137,11 @@ public:
 
 private:
   using TBase = RelationTagsBase;
-  using TNameKeys = unordered_set<string>;
+  using TNameKeys = std::unordered_set<std::string>;
 
   bool IsAcceptBoundary(RelationElement const & e) const
   {
-    string role;
+    std::string role;
     CHECK(e.FindWay(TBase::m_featureID, role), (TBase::m_featureID));
 
     // Do not accumulate boundary types (boundary=administrative) for inner polygons.
@@ -154,7 +154,7 @@ protected:
   {
     /// @todo Review route relations in future.
     /// Actually, now they give a lot of dummy tags.
-    string const & type = e.GetType();
+    std::string const & type = e.GetType();
     if (TBase::IsSkipRelation(type))
       return;
 
@@ -163,13 +163,13 @@ protected:
       if (e.GetTagValue("route") == "road")
       {
         // Append "network/ref" to the feature ref tag.
-        string ref = e.GetTagValue("ref");
+        std::string ref = e.GetTagValue("ref");
         if (!ref.empty())
         {
-          string const & network = e.GetTagValue("network");
-          if (!network.empty() && network.find('/') == string::npos)
+          std::string const & network = e.GetTagValue("network");
+          if (!network.empty() && network.find('/') == std::string::npos)
             ref = network + '/' + ref;
-          string const & refBase = m_current->GetTag("ref");
+          std::string const & refBase = m_current->GetTag("ref");
           if (!refBase.empty())
             ref = refBase + ';' + ref;
           TBase::AddCustomTag({"ref", std::move(ref)});
@@ -250,7 +250,7 @@ class OsmToFeatureTranslator
     FeatureBuilder1::TGeometry & GetHoles()
     {
       ASSERT(m_holes.empty(), ("Can call only once"));
-      m_merger.ForEachArea(false, [this](FeatureBuilder1::TPointSeq & v, vector<uint64_t> const &)
+      m_merger.ForEachArea(false, [this](FeatureBuilder1::TPointSeq & v, std::vector<uint64_t> const &)
       {
         m_holes.push_back(FeatureBuilder1::TPointSeq());
         m_holes.back().swap(v);
@@ -273,7 +273,7 @@ class OsmToFeatureTranslator
     {
       if (e.GetType() != "multipolygon")
         return false;
-      string role;
+      std::string role;
       if (e.FindWay(m_id, role) && (role == "outer"))
       {
         e.ForEachWay(*this);
@@ -284,7 +284,7 @@ class OsmToFeatureTranslator
     }
 
     /// 2. "ways in relation" process function
-    void operator() (uint64_t id, string const & role)
+    void operator() (uint64_t id, std::string const & role)
     {
       if (id != m_id && role == "inner")
         m_holes(id);
@@ -321,7 +321,7 @@ class OsmToFeatureTranslator
     ft.SetParams(params);
     if (ft.PreSerialize())
     {
-      string addr;
+      std::string addr;
       if (m_addrWriter && ftypes::IsBuildingChecker::Instance()(params.m_Types) &&
           ft.FormatFullAddress(addr))
       {
@@ -503,7 +503,7 @@ public:
         }
 
         auto const & holesGeometry = holes.GetHoles();
-        outer.ForEachArea(true, [&] (FeatureBuilder1::TPointSeq const & pts, vector<uint64_t> const & ids)
+        outer.ForEachArea(true, [&] (FeatureBuilder1::TPointSeq const & pts, std::vector<uint64_t> const & ids)
         {
           FeatureBuilder1 ft;
 
@@ -542,8 +542,8 @@ public:
 
 public:
   OsmToFeatureTranslator(TEmitter & emitter, TCache & holder, uint32_t coastType,
-                         string const & addrFilePath = {}, string const & restrictionsFilePath = {},
-                         string const & roadAccessFilePath = {})
+                         std::string const & addrFilePath = {}, std::string const & restrictionsFilePath = {},
+                         std::string const & roadAccessFilePath = {})
     : m_emitter(emitter)
     , m_holder(holder)
     , m_coastType(coastType)