Changeset 10771 for code/branches/cpp11_v2/src/libraries/core/Resource.cc

Timestamp:

Nov 7, 2015, 5:24:58 PM (9 years ago)

Author:

landauf

Message:

using std::shared_ptr instead of boost::shared_ptr (same for weak_ptr)

File:

• code/branches/cpp11_v2/src/libraries/core/Resource.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/libraries/core/Resource.cc

@@ -79 +79 @@
     }
 
-    shared_ptr<ResourceInfo> Resource::getInfo(const std::string& name)
+    std::shared_ptr<ResourceInfo> Resource::getInfo(const std::string& name)
     {
         std::string group;
@@ -88 +88 @@
         catch (const Ogre::Exception&)
         {
-            return shared_ptr<ResourceInfo>();
+            return std::shared_ptr<ResourceInfo>();
         }
         Ogre::FileInfoListPtr infos = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo(group, name);
@@ -95 +95 @@
             if (it->filename == name)
             {
-                shared_ptr<ResourceInfo> ptr(new ResourceInfo());
+                std::shared_ptr<ResourceInfo> ptr(new ResourceInfo());
                 ptr->filename = name;
                 ptr->path = it->path;
@@ -114 +114 @@
             }
         }
-        return shared_ptr<ResourceInfo>();
+        return std::shared_ptr<ResourceInfo>();
     }