Changeset 10829 for code/branches/cpp11_v2/src/libraries/util/output

Timestamp:

Nov 22, 2015, 5:30:57 PM (9 years ago)

Author:

landauf

Message:

replace all remaining usages of SharedPtr with std::shared_ptr

Location:

code/branches/cpp11_v2/src/libraries/util/output

Files:

• OutputManager.cc (modified) (2 diffs)
• OutputManager.h (modified) (2 diffs)

code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc

@@ -41 +41 @@
 #include "util/Output.h"
 #include "util/StringUtils.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -81 +80 @@
     }
 
-    /*static*/ SharedPtr<OutputManager>& OutputManager::Testing::getInstancePointer()
-    {
-        static SharedPtr<OutputManager> instance(new OutputManager());
+    /*static*/ std::shared_ptr<OutputManager>& OutputManager::Testing::getInstancePointer()
+    {
+        static std::shared_ptr<OutputManager> instance(new OutputManager());
         return instance;
     }

code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h

@@ -41 +41 @@
 #include <vector>
 #include <map>
+#include <memory>
 
 #include "OutputDefinitions.h"
@@ -137 +138 @@
             struct _UtilExport Testing
             {
-                static SharedPtr<OutputManager>& getInstancePointer();
+                static std::shared_ptr<OutputManager>& getInstancePointer();
             };
     };