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

8 files changed, 23 insertions, 17 deletions

diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 109028e792..5933bc1474 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -86,9 +86,9 @@ void BackendRenderer::Teardown()
 #endif
 }
 
-unique_ptr<threads::IRoutine> BackendRenderer::CreateRoutine()
+std::unique_ptr<threads::IRoutine> BackendRenderer::CreateRoutine()
 {
-  return make_unique<Routine>(*this);
+  return std::make_unique<Routine>(*this);
 }
 
 void BackendRenderer::RecacheGui(gui::TWidgetsInitInfo const & initInfo, bool needResetOldGui)
diff --git a/drape_frontend/backend_renderer.hpp b/drape_frontend/backend_renderer.hpp
index 817976e0f3..e47755a641 100644
--- a/drape_frontend/backend_renderer.hpp
+++ b/drape_frontend/backend_renderer.hpp
@@ -16,6 +16,7 @@
 #include "drape/viewport.hpp"
 
 #include <functional>
+#include <memory>
 
 namespace dp
 {
@@ -69,7 +70,7 @@ public:
   void Teardown();
 
 protected:
-  unique_ptr<threads::IRoutine> CreateRoutine() override;
+  std::unique_ptr<threads::IRoutine> CreateRoutine() override;
 
   void OnContextCreate() override;
   void OnContextDestroy() override;
diff --git a/drape_frontend/circles_pack_shape.cpp b/drape_frontend/circles_pack_shape.cpp
index 034231fb0c..1d433acb61 100644
--- a/drape_frontend/circles_pack_shape.cpp
+++ b/drape_frontend/circles_pack_shape.cpp
@@ -10,6 +10,8 @@
 #include "drape/graphics_context.hpp"
 #include "drape/texture_manager.hpp"
 
+#include <memory>
+
 namespace df
 {
 namespace
@@ -36,7 +38,7 @@ dp::RenderState GetCirclesPackState(ref_ptr<dp::TextureManager> texMng)
 
 dp::BindingInfo const & GetCirclesPackStaticBindingInfo()
 {
-  static unique_ptr<dp::BindingInfo> s_info;
+  static std::unique_ptr<dp::BindingInfo> s_info;
   if (s_info == nullptr)
   {
     dp::BindingFiller<CirclesPackStaticVertex> filler(1);
@@ -48,7 +50,7 @@ dp::BindingInfo const & GetCirclesPackStaticBindingInfo()
 
 dp::BindingInfo const & GetCirclesPackDynamicBindingInfo()
 {
-  static unique_ptr<dp::BindingInfo> s_info;
+  static std::unique_ptr<dp::BindingInfo> s_info;
   if (s_info == nullptr)
   {
     dp::BindingFiller<CirclesPackDynamicVertex> filler(2, kDynamicStreamID);
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 0f6c06779b..f2c683f80d 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -1020,9 +1020,9 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
   }
 }
 
-unique_ptr<threads::IRoutine> FrontendRenderer::CreateRoutine()
+std::unique_ptr<threads::IRoutine> FrontendRenderer::CreateRoutine()
 {
-  return make_unique<Routine>(*this);
+  return std::make_unique<Routine>(*this);
 }
 
 void FrontendRenderer::UpdateContextDependentResources()
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index ca9aa7b13c..d08bbd305e 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -36,6 +36,7 @@
 
 #include <array>
 #include <functional>
+#include <memory>
 #include <unordered_set>
 #include <vector>
 
@@ -140,7 +141,7 @@ public:
 
 protected:
   void AcceptMessage(ref_ptr<Message> message) override;
-  unique_ptr<threads::IRoutine> CreateRoutine() override;
+  std::unique_ptr<threads::IRoutine> CreateRoutine() override;
   void OnContextCreate() override;
   void OnContextDestroy() override;
 
@@ -344,7 +345,7 @@ private:
     bool m_enableAutoZoom;
   };
 
-  unique_ptr<FollowRouteData> m_pendingFollowRoute;
+  std::unique_ptr<FollowRouteData> m_pendingFollowRoute;
 
   std::vector<m2::TriangleD> m_dragBoundArea;
 
diff --git a/drape_frontend/gui/gui_text.cpp b/drape_frontend/gui/gui_text.cpp
index c645c493e9..7853aa95fc 100644
--- a/drape_frontend/gui/gui_text.cpp
+++ b/drape_frontend/gui/gui_text.cpp
@@ -83,7 +83,7 @@ void FillMaskDecl(dp::BindingDecl & decl, uint8_t stride, uint8_t offset)
 
 dp::BindingInfo const & StaticLabel::Vertex::GetBindingInfo()
 {
-  static unique_ptr<dp::BindingInfo> info;
+  static std::unique_ptr<dp::BindingInfo> info;
 
   if (info == nullptr)
   {
@@ -248,7 +248,7 @@ void StaticLabel::CacheStaticText(std::string const & text, char const * delim,
 
 dp::BindingInfo const & MutableLabel::StaticVertex::GetBindingInfo()
 {
-  static unique_ptr<dp::BindingInfo> info;
+  static std::unique_ptr<dp::BindingInfo> info;
 
   if (info == nullptr)
   {
@@ -270,7 +270,7 @@ dp::BindingInfo const & MutableLabel::StaticVertex::GetBindingInfo()
 
 dp::BindingInfo const & MutableLabel::DynamicVertex::GetBindingInfo()
 {
-  static unique_ptr<dp::BindingInfo> info;
+  static std::unique_ptr<dp::BindingInfo> info;
 
   if (info == nullptr)
   {
diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp
index 772318b00c..5c17961d0f 100644
--- a/drape_frontend/line_shape.cpp
+++ b/drape_frontend/line_shape.cpp
@@ -190,7 +190,7 @@ public:
     if (m_params.m_cap == dp::ButtCap)
       return TBase::GetCapBindingInfo();
 
-    static unique_ptr<dp::BindingInfo> s_capInfo;
+    static std::unique_ptr<dp::BindingInfo> s_capInfo;
     if (s_capInfo == nullptr)
     {
       dp::BindingFiller<CapVertex> filler(3);
@@ -510,7 +510,8 @@ void LineShape::Prepare(ref_ptr<dp::TextureManager> textures) const
       SimpleSolidLineBuilder::BuilderParams p;
       commonParamsBuilder(p);
 
-      auto builder = make_unique<SimpleSolidLineBuilder>(p, m_spline->GetPath().size(), lineWidth);
+      auto builder =
+          std::make_unique<SimpleSolidLineBuilder>(p, m_spline->GetPath().size(), lineWidth);
       Construct<SimpleSolidLineBuilder>(*builder);
       m_lineShapeInfo = move(builder);
     }
@@ -518,7 +519,7 @@ void LineShape::Prepare(ref_ptr<dp::TextureManager> textures) const
     {
       SolidLineBuilder::BuilderParams p;
       commonParamsBuilder(p);
-      auto builder = make_unique<SolidLineBuilder>(p, m_spline->GetPath().size());
+      auto builder = std::make_unique<SolidLineBuilder>(p, m_spline->GetPath().size());
       Construct<SolidLineBuilder>(*builder);
       m_lineShapeInfo = move(builder);
     }
@@ -534,7 +535,7 @@ void LineShape::Prepare(ref_ptr<dp::TextureManager> textures) const
     p.m_baseGtoP = m_params.m_baseGtoPScale;
     p.m_glbHalfWidth = pxHalfWidth / m_params.m_baseGtoPScale;
 
-    auto builder = make_unique<DashedLineBuilder>(p, m_spline->GetPath().size());
+    auto builder = std::make_unique<DashedLineBuilder>(p, m_spline->GetPath().size());
     Construct<DashedLineBuilder>(*builder);
     m_lineShapeInfo = move(builder);
   }
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index 4240fbc95e..2514bbd1a5 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -204,7 +204,8 @@ UserMarkRenderGroup::UserMarkRenderGroup(dp::RenderState const & state, TileKey
 
   if (program == gpu::Program::BookmarkAnim || program3d == gpu::Program::BookmarkAnimBillboard)
   {
-    m_animation = make_unique<OpacityAnimation>(0.25 /* duration */, 0.0 /* minValue */, 1.0 /* maxValue */);
+    m_animation = std::make_unique<OpacityAnimation>(0.25 /* duration */, 0.0 /* minValue */,
+                                                     1.0 /* maxValue */);
     m_mapping.AddRangePoint(0.6f, 1.3f);
     m_mapping.AddRangePoint(0.85f, 0.8f);
     m_mapping.AddRangePoint(1.0f, 1.0f);