Changeset 8789 for code/branches/output/src/libraries/util

Timestamp:

Jul 26, 2011, 11:06:01 AM (13 years ago)

Author:

landauf

Message:

some small details, allow direct usage of OutputStream()

Location:

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

Files:

• ConsoleWriter.cc (modified) (1 diff)
• OutputDefinitions.h (modified) (1 diff)
• OutputStream.cc (modified) (2 diffs)
• OutputStream.h (modified) (1 diff)

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

@@ -28 +28 @@
 
 #include "ConsoleWriter.h"
+
+#include <iostream>
 
 #include "OutputManager.h"

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

@@ -34 +34 @@
 
 #define REGISTER_OUTPUT_CONTEXT(name) \
-    OutputContext name() { static OutputContext value = registerContext(#name); return value; }
+    OutputContext name() { static OutputContext context = registerContext(#name); return context; }
 
 namespace orxonox

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

@@ -35 +35 @@
     OutputStream::OutputStream()
     {
-        this->level_ = level::none;
-        this->context_ = context::none;
-        this->bAcceptsOutput_ = false;
+        this->setOutputAttributes(level::debug_output, context::undefined());
+    }
+
+    OutputStream::OutputStream(OutputLevel level, OutputContext context)
+    {
+        this->setOutputAttributes(level, context);
     }
 
@@ -51 +54 @@
         this->context_ = context;
 
-        this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(this->level_, this->context_);
+        this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(level, context);
     }
 }

code/branches/output/src/libraries/util/output/OutputStream.h

@@ -44 +44 @@
         public:
             _UtilExport OutputStream();
+            _UtilExport OutputStream(OutputLevel level, OutputContext context);
 
             void _UtilExport setOutputAttributes(OutputLevel level, OutputContext context);