Changeset 9547 for code/branches/testing/src/libraries/util/output

Timestamp:

Mar 12, 2013, 10:05:25 PM (12 years ago)

Author:

landauf

Message:

return pointers instead of references because they could be null

Location:

code/branches/testing/src/libraries/util/output

Files:

• LogWriter.cc (modified) (1 diff)
• OutputManager.h (modified) (1 diff)

code/branches/testing/src/libraries/util/output/LogWriter.cc

@@ -168 +168 @@
 
         // request old output from MemoryWriter
-        if (&OutputManager::getInstance().getMemoryWriter())
-            OutputManager::getInstance().getMemoryWriter().resendOutput(this);
+        if (OutputManager::getInstance().getMemoryWriter())
+            OutputManager::getInstance().getMemoryWriter()->resendOutput(this);
     }
 

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

@@ -72 +72 @@
             static OutputManager& getInstanceAndCreateListeners();
 
-            inline MemoryWriter& getMemoryWriter()   { return *this->memoryWriterInstance_; }
-            inline ConsoleWriter& getConsoleWriter() { return *this->consoleWriterInstance_; }
-            inline LogWriter& getLogWriter()         { return *this->logWriterInstance_; }
+            inline MemoryWriter* getMemoryWriter()   { return this->memoryWriterInstance_; }
+            inline ConsoleWriter* getConsoleWriter() { return this->consoleWriterInstance_; }
+            inline LogWriter* getLogWriter()         { return this->logWriterInstance_; }
 
             virtual void pushMessage(OutputLevel level, const OutputContextContainer& context, const std::string& message);