Index: code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc	(revision 10765)
+++ code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc	(revision 10829)
@@ -3,5 +3,4 @@
 #include "util/output/ConsoleWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -16,5 +15,5 @@
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
Index: code/branches/cpp11_v2/test/util/output/LogWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/LogWriterTest.cc	(revision 10765)
+++ code/branches/cpp11_v2/test/util/output/LogWriterTest.cc	(revision 10829)
@@ -4,5 +4,4 @@
 #include "util/Convert.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -24,5 +23,5 @@
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
Index: code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc	(revision 10765)
+++ code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc	(revision 10829)
@@ -4,5 +4,4 @@
 #include "util/output/MemoryWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -23,5 +22,5 @@
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
Index: code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc	(revision 10765)
+++ code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc	(revision 10829)
@@ -3,5 +3,4 @@
 #include "util/output/OutputListener.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -342,10 +341,10 @@
             {
                 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());
             }
 
Index: code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc	(revision 10765)
+++ code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc	(revision 10829)
@@ -8,5 +8,4 @@
 #include "util/output/OutputManager.h"
 #include "util/output/MemoryWriter.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -88,10 +87,10 @@
             {
                 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());
             }
 
