Changeset 11054 for code/branches/cpp11_v3/test/util/output/MemoryWriterTest.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• test/util/output/MemoryWriterTest.cc (modified) (2 diffs)

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

@@ -4 +4 @@
 #include "util/output/MemoryWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -20 +19 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                 }