1 files changed, 31 insertions, 31 deletions

diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index cca5e99717..cd41746ff8 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -3,13 +3,13 @@
 #include "base/math.hpp"
 #include "base/string_utils.hpp"
 
-#include "std/exception.hpp"
-#include "std/function.hpp"
-#include "std/iomanip.hpp"
-#include "std/iostream.hpp"
-#include "std/map.hpp"
-#include "std/string.hpp"
-#include "std/vector.hpp"
+#include <exception>
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
 
 struct OsmElement
 {
@@ -29,10 +29,10 @@ struct OsmElement
   {
     uint64_t ref = 0;
     EntityType type = EntityType::Unknown;
-    string role;
+    std::string role;
 
     Member() = default;
-    Member(uint64_t ref, EntityType type, string const & role)
+    Member(uint64_t ref, EntityType type, std::string const & role)
     : ref(ref), type(type), role(role)
     {}
 
@@ -44,11 +44,11 @@ struct OsmElement
 
   struct Tag
   {
-    string key;
-    string value;
+    std::string key;
+    std::string value;
 
     Tag() = default;
-    Tag(string const & k, string const & v) : key(k), value(v) {}
+    Tag(std::string const & k, std::string const & v) : key(k), value(v) {}
 
     bool operator == (Tag const & e) const
     {
@@ -67,14 +67,14 @@ struct OsmElement
   double lon = 0;
   double lat = 0;
   uint64_t ref = 0;
-  string k;
-  string v;
+  std::string k;
+  std::string v;
   EntityType memberType = EntityType::Unknown;
-  string role;
+  std::string role;
 
-  vector<uint64_t> m_nds;
-  vector<Member> m_members;
-  vector<Tag> m_tags;
+  std::vector<uint64_t> m_nds;
+  std::vector<Member> m_members;
+  std::vector<Tag> m_tags;
 
   void Clear()
   {
@@ -93,13 +93,13 @@ struct OsmElement
     m_tags.clear();
   }
 
-  string ToString(string const & shift = string()) const;
+  std::string ToString(std::string const & shift = std::string()) const;
 
-  inline vector<uint64_t> const & Nodes() const { return m_nds; }
-  inline vector<Member> const & Members() const { return m_members; }
-  inline vector<Tag> const & Tags() const { return m_tags; }
+  inline std::vector<uint64_t> const & Nodes() const { return m_nds; }
+  inline std::vector<Member> const & Members() const { return m_members; }
+  inline std::vector<Tag> const & Tags() const { return m_tags; }
 
-  static EntityType StringToEntityType(string const & t)
+  static EntityType StringToEntityType(std::string const & t)
   {
     if (t == "way")
       return EntityType::Way;
@@ -130,13 +130,13 @@ struct OsmElement
   }
 
   void AddNd(uint64_t ref) { m_nds.emplace_back(ref); }
-  void AddMember(uint64_t ref, EntityType type, string const & role)
+  void AddMember(uint64_t ref, EntityType type, std::string const & role)
   {
     m_members.emplace_back(ref, type, role);
   }
 
-  void AddTag(string const & k, string const & v);
-  template <class TFn> void UpdateTag(string const & k, TFn && fn)
+  void AddTag(std::string const & k, std::string const & v);
+  template <class TFn> void UpdateTag(std::string const & k, TFn && fn)
   {
     for (auto & tag : m_tags)
     {
@@ -147,15 +147,15 @@ struct OsmElement
       }
     }
 
-    string v;
+    std::string v;
     fn(v);
     if (!v.empty())
       AddTag(k, v);
   }
 
-  string GetTag(string const & key) const;
+  std::string GetTag(std::string const & key) const;
 };
 
-string DebugPrint(OsmElement const & e);
-string DebugPrint(OsmElement::EntityType e);
-string DebugPrint(OsmElement::Tag const & tag);
+std::string DebugPrint(OsmElement const & e);
+std::string DebugPrint(OsmElement::EntityType e);
+std::string DebugPrint(OsmElement::Tag const & tag);