Changeset 9542

Timestamp:

Mar 10, 2013, 3:08:58 PM (12 years ago)

Author:

landauf

Message:

added option to disable static caching of output contexts (for unit tests)
fixed description of ConsoleWriter and LogWriter

Location:

code/branches/testing

Files:

• src/libraries/util/output/ConsoleWriter.h (modified) (1 diff)
• src/libraries/util/output/LogWriter.h (modified) (1 diff)
• src/libraries/util/output/OutputDefinitions.h (modified) (2 diffs)
• test/util/output/OutputStreamTest.cc (modified) (2 diffs)

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

@@ -47 +47 @@
         @brief ConsoleWriter inherits from BaseWriter and writes output to the console.
 
-        This class can be seen as an equivalent to std::cout within the output
-        system. It is implemented as a singleton for static acces.
+        This class can be seen as an equivalent to std::cout within the output system.
     */
     class _UtilExport ConsoleWriter : public BaseWriter

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

@@ -47 +47 @@
         @brief The LogWriter class inherits from BaseWriter and writes output to a log-file.
 
-        It is implemented as singleton because we (currently) use only one
-        log-file. The path of the file can be changed, in which case the file
+        The path of the file can be changed, in which case the file
         is rewritten by using the output stored by MemoryWriter. This adds the
         possibility to change the desired output levels before changing the

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

@@ -47 +47 @@
     context argument.
 */
-#define REGISTER_OUTPUT_CONTEXT(name) \
-    const OutputContextContainer& name() { static OutputContextContainer context = registerContext(#name); return context; }
+#ifndef DISABLE_OUTPUT_CONTEXT_STATIC_CACHE
+    #define REGISTER_OUTPUT_CONTEXT(name) \
+        const OutputContextContainer& name() { static OutputContextContainer context = registerContext(#name); return context; }
+#else
+    #define REGISTER_OUTPUT_CONTEXT(name) \
+        const OutputContextContainer& name() { return registerContext(#name); }
+#endif
 
 /**
@@ -60 +65 @@
     individually by derivatives of orxonox::SubcontextOutputListener.
 */
-#define REGISTER_OUTPUT_SUBCONTEXT(name, subname) \
-    const OutputContextContainer& subname() { static const OutputContextContainer& context = registerContext(#name, #subname); return context; }
+#ifndef DISABLE_OUTPUT_CONTEXT_STATIC_CACHE
+    #define REGISTER_OUTPUT_SUBCONTEXT(name, subname) \
+        const OutputContextContainer& subname() { static const OutputContextContainer context = registerContext(#name, #subname); return context; }
+#else
+    #define REGISTER_OUTPUT_SUBCONTEXT(name, subname) \
+        const OutputContextContainer& subname() { return registerContext(#name, #subname); }
+#endif
 
 // tolua_begin

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

@@ -1 +1 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
+
+#define DISABLE_OUTPUT_CONTEXT_STATIC_CACHE
+
 #include "util/Output.h"
 #include "util/output/OutputStream.h"
@@ -141 +144 @@
         OutputStream stream;
 
-        const OutputContextContainer& context = context::undefined();
+        const OutputContextContainer& context = context::unittest1();
 
         stream.setOutputAttributes(level::verbose, context);