Changeset 10829 for code/branches/cpp11_v2/test

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/test/util/output

Files:

• ConsoleWriterTest.cc (modified) (2 diffs)
• LogWriterTest.cc (modified) (2 diffs)
• MemoryWriterTest.cc (modified) (2 diffs)
• OutputListenerTest.cc (modified) (2 diffs)
• OutputStreamTest.cc (modified) (2 diffs)

code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc

@@ -3 +3 @@
 #include "util/output/ConsoleWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -16 +15 @@
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 

code/branches/cpp11_v2/test/util/output/LogWriterTest.cc

@@ -4 +4 @@
 #include "util/Convert.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -24 +23 @@
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 

code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc

@@ -4 +4 @@
 #include "util/output/MemoryWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -23 +22 @@
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 

code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc

@@ -3 +3 @@
 #include "util/output/OutputListener.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -342 +341 @@
             {
                 this->manager_ = new MockOutputManager();
-                OutputManager::Testing::getInstancePointer() = this->manager_;
+                OutputManager::Testing::getInstancePointer().reset(this->manager_);
             }
 
             virtual void TearDown()
             {
-                OutputManager::Testing::getInstancePointer() = new OutputManager();
+                OutputManager::Testing::getInstancePointer().reset(new OutputManager());
             }
 

code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc

@@ -8 +8 @@
 #include "util/output/OutputManager.h"
 #include "util/output/MemoryWriter.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -88 +87 @@
             {
                 this->manager_ = new MockOutputManager();
-                OutputManager::Testing::getInstancePointer() = this->manager_;
+                OutputManager::Testing::getInstancePointer().reset(this->manager_);
             }
 
             virtual void TearDown()
             {
-                OutputManager::Testing::getInstancePointer() = new OutputManager();
+                OutputManager::Testing::getInstancePointer().reset(new OutputManager());
             }