From c9ca96460735f02b0d2f50f0adc67facd6a5ad8a Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Sat, 14 Jan 2012 21:11:18 +0300
Subject: [PATCH] Replaced auto_ptr with scoped_ptr

---
 yg/resource_manager.cpp |  4 ++--
 yg/resource_manager.hpp | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/yg/resource_manager.cpp b/yg/resource_manager.cpp
index 52e7e5a1f2..9c2d10abdd 100644
--- a/yg/resource_manager.cpp
+++ b/yg/resource_manager.cpp
@@ -497,7 +497,7 @@ namespace yg
       LOG(LERROR, ("no params to init glyph caches."));
   }
 
-  void ResourceManager::initStoragePool(StoragePoolParams const & p, auto_ptr<TStoragePool> & pool)
+  void ResourceManager::initStoragePool(StoragePoolParams const & p, scoped_ptr<TStoragePool> & pool)
   {
     if (p.isValid())
     {
@@ -512,7 +512,7 @@ namespace yg
       LOG(LINFO, ("no ", p.m_poolName, " resource"));
   }
 
-  void ResourceManager::initTexturePool(TexturePoolParams const & p, auto_ptr<TTexturePool> & pool)
+  void ResourceManager::initTexturePool(TexturePoolParams const & p, scoped_ptr<TTexturePool> & pool)
   {
     if (p.isValid())
     {
diff --git a/yg/resource_manager.hpp b/yg/resource_manager.hpp
index 4c61dbbdfc..8e69daf8a0 100644
--- a/yg/resource_manager.hpp
+++ b/yg/resource_manager.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "../std/shared_ptr.hpp"
+#include "../std/scoped_ptr.hpp"
 #include "../std/map.hpp"
 #include "../std/string.hpp"
 #include "../std/list.hpp"
-#include "../std/auto_ptr.hpp"
 
 #include "../base/mutex.hpp"
 #include "../base/resource_pool.hpp"
@@ -215,17 +215,17 @@ namespace yg
 
     threads::Mutex m_mutex;
 
-    auto_ptr<TTexturePool> m_primaryTextures;
-    auto_ptr<TTexturePool> m_fontTextures;
-    auto_ptr<TTexturePool> m_styleCacheTextures;
-    auto_ptr<TTexturePool> m_renderTargets;
-    auto_ptr<TTexturePool> m_guiThreadTextures;
+    scoped_ptr<TTexturePool> m_primaryTextures;
+    scoped_ptr<TTexturePool> m_fontTextures;
+    scoped_ptr<TTexturePool> m_styleCacheTextures;
+    scoped_ptr<TTexturePool> m_renderTargets;
+    scoped_ptr<TTexturePool> m_guiThreadTextures;
 
-    auto_ptr<TStoragePool> m_primaryStorages;
-    auto_ptr<TStoragePool> m_smallStorages;
-    auto_ptr<TStoragePool> m_blitStorages;
-    auto_ptr<TStoragePool> m_multiBlitStorages;
-    auto_ptr<TStoragePool> m_guiThreadStorages;
+    scoped_ptr<TStoragePool> m_primaryStorages;
+    scoped_ptr<TStoragePool> m_smallStorages;
+    scoped_ptr<TStoragePool> m_blitStorages;
+    scoped_ptr<TStoragePool> m_multiBlitStorages;
+    scoped_ptr<TStoragePool> m_guiThreadStorages;
 
     vector<GlyphCache> m_glyphCaches;
 
@@ -237,7 +237,7 @@ namespace yg
 
     void initGlyphCaches(GlyphCacheParams const & p);
 
-    void initStoragePool(StoragePoolParams const & p, auto_ptr<TStoragePool> & pool);
+    void initStoragePool(StoragePoolParams const & p, scoped_ptr<TStoragePool> & pool);
 
     TStoragePool * primaryStorages();
     TStoragePool * smallStorages();
@@ -245,7 +245,7 @@ namespace yg
     TStoragePool * multiBlitStorages();
     TStoragePool * guiThreadStorages();
 
-    void initTexturePool(TexturePoolParams const & p, auto_ptr<TTexturePool> & pool);
+    void initTexturePool(TexturePoolParams const & p, scoped_ptr<TTexturePool> & pool);
 
     TTexturePool * primaryTextures();
     TTexturePool * fontTextures();