Changeset 8776 for code/branches/output/src/libraries/util/output/OutputManager.cc

Timestamp:

Jul 25, 2011, 1:05:04 PM (13 years ago)

Author:

landauf

Message:

in OutputManager: getInstance now only creates an instance of OutputManager, while getInstanceAndCreateListeners does additional stuff. the latter ins only used in OutputStream to ensure the default listeners (LogWriter, etc) get created. This should avoid circular calls.

File:

• code/branches/output/src/libraries/util/output/OutputManager.cc (modified) (2 diffs)

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

@@ -69 +69 @@
     /*static*/ OutputManager& OutputManager::getInstance()
     {
-        static OutputManager& instance = OutputManager::getInstanceInternal();
+        static OutputManager instance;
+        return instance;
+    }
+
+    /*static*/ OutputManager& OutputManager::getInstanceAndCreateListeners()
+    {
+        static OutputManager& instance = OutputManager::getInstance();
 
         static ConsoleOutput consoleOutputInstance;
@@ -75 +81 @@
         static LogWriter& logWriterInstance = LogWriter::getInstance(); (void)logWriterInstance;
 
-        return instance;
-    }
-
-    /*static*/ OutputManager& OutputManager::getInstanceInternal()
-    {
-        static OutputManager instance;
         return instance;
     }