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

3 files changed, 9 insertions, 7 deletions

diff --git a/generator/emitter_world.cpp b/generator/emitter_world.cpp
index ac408059ec..d864f3ff06 100644
--- a/generator/emitter_world.cpp
+++ b/generator/emitter_world.cpp
@@ -11,8 +11,8 @@
 namespace generator
 {
 EmitterWorld::EmitterWorld(feature::GenerateInfo const & info)
-  : m_cityBoundaryProcessor(
-        std::make_shared<CityBoundaryProcessor>(make_shared<generator::OsmIdToBoundariesTable>()))
+  : m_cityBoundaryProcessor(std::make_shared<CityBoundaryProcessor>(
+        std::make_shared<generator::OsmIdToBoundariesTable>()))
   , m_worldMapper(std::make_shared<WorldMapper>(
         info.GetTmpFileName(WORLD_FILE_NAME),
         info.GetIntermediateFileName(WORLD_COASTS_FILE_NAME, RAW_GEOM_FILE_EXTENSION),
diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index cb69b954e1..82f54fe406 100644
--- a/generator/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -38,8 +38,8 @@ FeaturesCollector::~FeaturesCollector()
 template <typename ValueT, size_t ValueSizeT = sizeof(ValueT) + 1>
 std::pair<char[ValueSizeT], uint8_t> PackValue(ValueT v)
 {
-  static_assert(is_integral<ValueT>::value, "Non integral value");
-  static_assert(is_unsigned<ValueT>::value, "Non unsigned value");
+  static_assert(std::is_integral<ValueT>::value, "Non integral value");
+  static_assert(std::is_unsigned<ValueT>::value, "Non unsigned value");
 
   std::pair<char[ValueSizeT], uint8_t> res;
   res.second = 0;
@@ -71,7 +71,7 @@ void FeaturesCollector::Write(char const * src, size_t size)
     if (m_writePosition == kBufferSize)
       FlushBuffer();
 
-    size_t const part_size = min(size, kBufferSize - m_writePosition);
+    size_t const part_size = std::min(size, kBufferSize - m_writePosition);
     memcpy(&m_writeBuffer[m_writePosition], src, part_size);
     m_writePosition += part_size;
     size -= part_size;
diff --git a/generator/intermediate_data.hpp b/generator/intermediate_data.hpp
index 2550a2c8fa..c4e61d17be 100644
--- a/generator/intermediate_data.hpp
+++ b/generator/intermediate_data.hpp
@@ -16,6 +16,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <limits>
+#include <memory>
 #include <string>
 #include <type_traits>
 #include <unordered_map>
@@ -31,7 +32,7 @@ namespace generator
 namespace cache
 {
 using Key = uint64_t;
-static_assert(is_integral<Key>::value, "Key must be an integral type");
+static_assert(std::is_integral<Key>::value, "Key must be an integral type");
 
 // Used to store all world nodes inside temporary index file.
 // To find node by id, just calculate offset inside index file:
@@ -199,7 +200,8 @@ protected:
 class IntermediateDataReader
 {
 public:
-  IntermediateDataReader(shared_ptr<PointStorageReaderInterface> nodes, feature::GenerateInfo & info);
+  IntermediateDataReader(std::shared_ptr<PointStorageReaderInterface> nodes,
+                         feature::GenerateInfo & info);
 
   bool GetNode(Key id, double & lat, double & lon) const { return m_nodes->GetPoint(id, lat, lon); }
   bool GetWay(Key id, WayElement & e) { return m_ways.Read(id, e); }