1 files changed, 15 insertions, 15 deletions

diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp
index 9bb881c88d..6c530971ec 100644
--- a/generator/osm_source.hpp
+++ b/generator/osm_source.hpp
@@ -3,12 +3,12 @@
 #include "generator/generate_info.hpp"
 #include "generator/osm_element.hpp"
 
-#include "std/function.hpp"
-#include "std/iostream.hpp"
-#include "std/string.hpp"
-#include "std/sstream.hpp"
-#include "std/unique_ptr.hpp"
-#include "std/vector.hpp"
+#include <functional>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 class SourceReader
 {
@@ -16,19 +16,19 @@ class SourceReader
   {
     bool m_needDelete;
     Deleter(bool needDelete = true) : m_needDelete(needDelete) {}
-    void operator()(istream * s) const
+    void operator()(std::istream * s) const
     {
       if (m_needDelete)
         delete s;
     }
   };
 
-  unique_ptr<istream, Deleter> m_file;
+  std::unique_ptr<std::istream, Deleter> m_file;
 
 public:
   SourceReader();
-  explicit SourceReader(string const & filename);
-  explicit SourceReader(istringstream & stream);
+  explicit SourceReader(std::string const & filename);
+  explicit SourceReader(std::istringstream & stream);
 
   uint64_t Read(char * buffer, uint64_t bufferSize);
 };
@@ -48,16 +48,16 @@ public:
   virtual bool Finish() { return true; }
   /// Sets buckets (mwm names).
   // TODO(syershov): Make this topic clear.
-  virtual void GetNames(vector<string> & names) const = 0;
+  virtual void GetNames(std::vector<std::string> & names) const = 0;
 };
 
-unique_ptr<EmitterBase> MakeMainFeatureEmitter(feature::GenerateInfo const & info);
+std::unique_ptr<EmitterBase> MakeMainFeatureEmitter(feature::GenerateInfo const & info);
 
-using EmitterFactory = function<unique_ptr<EmitterBase>(feature::GenerateInfo const &)>;
+using EmitterFactory = std::function<std::unique_ptr<EmitterBase>(feature::GenerateInfo const &)>;
 
 bool GenerateFeatures(feature::GenerateInfo & info,
                       EmitterFactory factory = MakeMainFeatureEmitter);
 bool GenerateIntermediateData(feature::GenerateInfo & info);
 
-void ProcessOsmElementsFromO5M(SourceReader & stream, function<void(OsmElement *)> processor);
-void ProcessOsmElementsFromXML(SourceReader & stream, function<void(OsmElement *)> processor);
+void ProcessOsmElementsFromO5M(SourceReader & stream, std::function<void(OsmElement *)> processor);
+void ProcessOsmElementsFromXML(SourceReader & stream, std::function<void(OsmElement *)> processor);