[cpp11] make_shared_ptr -> std::make_shared

11 files changed, 29 insertions, 29 deletions

diff --git a/graphics/display_list_renderer.cpp b/graphics/display_list_renderer.cpp
index 73943b4467..d0dc96cb25 100644
--- a/graphics/display_list_renderer.cpp
+++ b/graphics/display_list_renderer.cpp
@@ -123,7 +123,7 @@ namespace graphics
       return;
 
     if (m_displayList)
-      m_displayList->uploadResources(make_shared_ptr(new UploadData(resources, count, texture)));
+      m_displayList->uploadResources(make_shared<UploadData>(resources, count, texture));
     else
       base_t::uploadResources(resources, count, texture);
   }
@@ -199,7 +199,7 @@ namespace graphics
   void DisplayListRenderer::applyBlitStates()
   {
     if (m_displayList)
-      m_displayList->applyBlitStates(make_shared_ptr(new ApplyBlitStates()));
+      m_displayList->applyBlitStates(make_shared<ApplyBlitStates>());
     else
       base_t::applyBlitStates();
   }
@@ -207,7 +207,7 @@ namespace graphics
   void DisplayListRenderer::applyStates()
   {
     if (m_displayList)
-      m_displayList->applyStates(make_shared_ptr(new ApplyStates()));
+      m_displayList->applyStates(make_shared<ApplyStates>());
     else
       base_t::applyStates();
   }
@@ -215,7 +215,7 @@ namespace graphics
   void DisplayListRenderer::applyVarAlfaStates()
   {
     if (m_displayList)
-      m_displayList->applyStates(make_shared_ptr(new ApplyStates(ApplyStates::AlfaVaringProgram)));
+      m_displayList->applyStates(make_shared<ApplyStates>(ApplyStates::AlfaVaringProgram));
     else
       base_t::applyVarAlfaStates();
   }
@@ -223,7 +223,7 @@ namespace graphics
   void DisplayListRenderer::applySharpStates()
   {
     if (m_displayList)
-      m_displayList->applySharpStates(make_shared_ptr(new ApplySharpStates()));
+      m_displayList->applySharpStates(make_shared<ApplySharpStates>());
     else
       base_t::applySharpStates();
   }
diff --git a/graphics/glyph_cache_impl.cpp b/graphics/glyph_cache_impl.cpp
index 83c39bc21f..156ac9737c 100644
--- a/graphics/glyph_cache_impl.cpp
+++ b/graphics/glyph_cache_impl.cpp
@@ -625,7 +625,7 @@ namespace graphics
 
     FTC_Node_Unref(node, m_manager);
 
-    return make_shared_ptr(bitmap);
+    return shared_ptr<GlyphBitmap>(bitmap);
   }
 
   FT_Error GlyphCacheImpl::RequestFace(FTC_FaceID faceID, FT_Library library, FT_Pointer /*requestData*/, FT_Face * face)
diff --git a/graphics/graphics_tests/screengl_test.cpp b/graphics/graphics_tests/screengl_test.cpp
index 9c87410d71..553442ce8b 100644
--- a/graphics/graphics_tests/screengl_test.cpp
+++ b/graphics/graphics_tests/screengl_test.cpp
@@ -1224,7 +1224,7 @@ namespace
   public:
     void DoDraw(shared_ptr<graphics::Screen> p)
     {
-      p->setOverlay(make_shared_ptr(new graphics::Overlay()));
+      p->setOverlay(make_shared<graphics::Overlay>());
       p->overlay()->setCouldOverlap(false);
 
       p->drawSymbol(m2::PointD(200, 200), "current-position", graphics::EPosUnder, graphics::maxDepth);
diff --git a/graphics/opengl/clipper.cpp b/graphics/opengl/clipper.cpp
index 79dcea02b2..00d038db81 100644
--- a/graphics/opengl/clipper.cpp
+++ b/graphics/opengl/clipper.cpp
@@ -43,7 +43,7 @@ namespace graphics
     {
       m_isClippingEnabled = flag;
 
-      processCommand(make_shared_ptr(new EnableClipRect(flag)));
+      processCommand(make_shared<EnableClipRect>(flag));
     }
 
     bool Clipper::clipRectEnabled() const
@@ -68,7 +68,7 @@ namespace graphics
 
       ASSERT ( m_clipRect.IsValid(), (m_clipRect) );
 
-      processCommand(make_shared_ptr(new SetClipRect(m_clipRect)));
+      processCommand(make_shared<SetClipRect>(m_clipRect));
     }
 
     m2::RectI const & Clipper::clipRect() const
diff --git a/graphics/opengl/geometry_renderer.cpp b/graphics/opengl/geometry_renderer.cpp
index 13ae10aa0f..2a588f9d5f 100644
--- a/graphics/opengl/geometry_renderer.cpp
+++ b/graphics/opengl/geometry_renderer.cpp
@@ -143,7 +143,7 @@ namespace graphics
                                            size_t count,
                                            shared_ptr<BaseTexture> const & texture)
     {
-      processCommand(make_shared_ptr(new UploadData(resources, count, texture)));
+      processCommand(make_shared<UploadData>(resources, count, texture));
     }
 
     GeometryRenderer::DrawGeometry::DrawGeometry()
@@ -366,12 +366,12 @@ namespace graphics
 
     void GeometryRenderer::applyStates()
     {
-      processCommand(make_shared_ptr(new ApplyStates()));
+      processCommand(make_shared<ApplyStates>());
     }
 
     void GeometryRenderer::applyVarAlfaStates()
     {
-      processCommand(make_shared_ptr(new ApplyStates(ApplyStates::AlfaVaringProgram)));
+      processCommand(make_shared<ApplyStates>(ApplyStates::AlfaVaringProgram));
     }
 
     void GeometryRenderer::ApplyBlitStates::perform()
@@ -393,7 +393,7 @@ namespace graphics
 
     void GeometryRenderer::applyBlitStates()
     {
-      processCommand(make_shared_ptr(new ApplyBlitStates()));
+      processCommand(make_shared<ApplyBlitStates>());
     }
 
     void GeometryRenderer::ApplySharpStates::perform()
@@ -435,7 +435,7 @@ namespace graphics
 
     void GeometryRenderer::applySharpStates()
     {
-      processCommand(make_shared_ptr(new ApplySharpStates()));
+      processCommand(make_shared<ApplySharpStates>());
     }
   }
 }
diff --git a/graphics/opengl/renderer.cpp b/graphics/opengl/renderer.cpp
index b71619ad34..209202b5ce 100644
--- a/graphics/opengl/renderer.cpp
+++ b/graphics/opengl/renderer.cpp
@@ -72,14 +72,14 @@ namespace graphics
         m_frameBuffer->setRenderTarget(m_renderTarget);
         m_frameBuffer->setDepthBuffer(m_depthBuffer);
 
-        processCommand(make_shared_ptr(new ChangeFrameBuffer(m_frameBuffer)));
+        processCommand(make_shared<ChangeFrameBuffer>(m_frameBuffer));
 
         if (m_renderTarget != 0)
           m_renderTarget->coordMatrix(coordM);
       }
 
-      processCommand(make_shared_ptr(new ChangeMatrix(EProjection, coordM)));
-      processCommand(make_shared_ptr(new ChangeMatrix(EModelView, math::Identity<float, 4>())));
+      processCommand(make_shared<ChangeMatrix>(EProjection, coordM));
+      processCommand(make_shared<ChangeMatrix>(EModelView, math::Identity<float, 4>()));
     }
 
     bool Renderer::isRendering() const
@@ -122,12 +122,12 @@ namespace graphics
       }
 
       if (glDiscardFramebufferFn)
-        processCommand(make_shared_ptr(new DiscardFramebuffer(doDiscardColor, doDiscardDepth)));
+        processCommand(make_shared<DiscardFramebuffer>(doDiscardColor, doDiscardDepth));
     }
 
     void Renderer::copyFramebufferToImage(shared_ptr<BaseTexture> target)
     {
-      processCommand(make_shared_ptr(new CopyFramebufferToImage(target)));
+      processCommand(make_shared<CopyFramebufferToImage>(target));
     }
 
     void Renderer::endFrame()
diff --git a/graphics/packets_queue.cpp b/graphics/packets_queue.cpp
index db068d32c9..792745d54a 100644
--- a/graphics/packets_queue.cpp
+++ b/graphics/packets_queue.cpp
@@ -93,7 +93,7 @@ namespace graphics
   int PacketsQueue::insertFence(Packet::EType type)
   {
     int id = m_fenceManager.insertFence();
-    processPacket(Packet(make_shared_ptr(new SignalFence(id, &m_fenceManager)), type));
+    processPacket(Packet(make_shared<SignalFence>(id, &m_fenceManager), type));
     return id;
   }
 
diff --git a/graphics/packets_queue.hpp b/graphics/packets_queue.hpp
index 85a2849b6c..cd42e2c56b 100644
--- a/graphics/packets_queue.hpp
+++ b/graphics/packets_queue.hpp
@@ -123,7 +123,7 @@ namespace graphics
     template <typename Fn>
     void processFn(Fn fn, bool performOnCancel = false)
     {
-      processPacket(Packet(make_shared_ptr(new FunctorCommand<Fn>(fn)), Packet::ECommand));
+      processPacket(Packet(make_shared<FunctorCommand<Fn>>(fn), Packet::ECommand));
     }
 
     template <typename Fn>
diff --git a/graphics/pipeline_manager.cpp b/graphics/pipeline_manager.cpp
index 17645d0d95..7c1ddf4924 100644
--- a/graphics/pipeline_manager.cpp
+++ b/graphics/pipeline_manager.cpp
@@ -27,9 +27,9 @@ namespace graphics
     vector<shared_ptr<ResourceCache> > v;
 
     for (unsigned i = 0; i < count; ++i)
-      v.push_back(make_shared_ptr(new ResourceCache(resourceManager(),
-                                                    textureType,
-                                                    pipelinesCount() + i)));
+      v.push_back(make_shared<ResourceCache>(resourceManager(),
+                                             textureType,
+                                             pipelinesCount() + i));
 
     return reservePipelines(v, storageType, decl);
   }
diff --git a/graphics/resource_manager.cpp b/graphics/resource_manager.cpp
index 2e285eceb8..05f3d334ec 100644
--- a/graphics/resource_manager.cpp
+++ b/graphics/resource_manager.cpp
@@ -280,7 +280,7 @@ namespace
         MYTHROW(RootException, ("Invalid skin file"));
 
       string const textureFileName = m_skinBuffer.substr(i, j-i);
-      m_staticTextures[textureFileName] = make_shared_ptr(new TStaticTexture(textureFileName, density));
+      m_staticTextures[textureFileName] = make_shared<TStaticTexture>(textureFileName, density);
     }
     catch (RootException const & ex)
     {
@@ -434,11 +434,11 @@ namespace
     switch (m_params.m_texRtFormat)
     {
     case Data8Bpp:
-      return make_shared_ptr(new gl::Texture<RGBA8Traits, false>(w, h));
+      return make_shared<gl::Texture<RGBA8Traits, false>>(w, h);
     case Data4Bpp:
-      return make_shared_ptr(new gl::Texture<RGBA4Traits, false>(w, h));
+      return make_shared<gl::Texture<RGBA4Traits, false>>(w, h);
     case Data565Bpp:
-      return make_shared_ptr(new gl::Texture<RGB565Traits, false>(w, h));
+      return make_shared<gl::Texture<RGB565Traits, false>>(w, h);
     default:
       MYTHROW(ResourceManagerException, ("unknown render target format"));
     };
diff --git a/graphics/skin_loader.cpp b/graphics/skin_loader.cpp
index ec5260cb6f..3a1d15a44e 100644
--- a/graphics/skin_loader.cpp
+++ b/graphics/skin_loader.cpp
@@ -48,7 +48,7 @@ namespace graphics
 
   void SkinLoader::popPage()
   {
-    m_caches.push_back(make_shared_ptr(new ResourceCache(m_resourceManager, m_fileName, m_caches.size())));
+    m_caches.push_back(make_shared<ResourceCache>(m_resourceManager, m_fileName, m_caches.size()));
 
     TResourceList::iterator prevIt = m_resourceList.end();