Changeset 8779

Timestamp:

Jul 25, 2011, 6:28:57 PM (13 years ago)

Author:

landauf

Message:

small changes regarding context functions and orxout()

Location:

code/branches/output/src/libraries/util

Files:

• Output.h (modified) (2 diffs)
• output/OutputStream.cc (modified) (1 diff)
• output/OutputStream.h (modified) (1 diff)

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

@@ -35 +35 @@
 namespace orxonox
 {
-using namespace test;
 namespace test
 {
+    // Just for convenience
+    using std::endl;
     using namespace level;
 
-    inline OutputStream& orxout(OutputLevel level = level::debug_output, OutputContextFunction context = context::undefined)
+    inline OutputStream& orxout(OutputLevel level = level::debug_output, OutputContext context = context::undefined())
     {
         static OutputStream stream;
@@ -46 +47 @@
         return stream;
     }
+
+    inline OutputStream& orxout(OutputLevel level, OutputContextFunction context)
+    {
+        return orxout(level, context());
+    }
 }
 }

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

@@ -48 +48 @@
     }
 
-    void OutputStream::setOutputAttributes(OutputLevel level, OutputContextFunction context)
+    void OutputStream::setOutputAttributes(OutputLevel level, OutputContext context)
     {
         this->level_ = level;
-        this->context_ = context();
+        this->context_ = context;
 
         this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(this->level_, this->context_);

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

@@ -47 +47 @@
             _UtilExport OutputStream();
 
-            void _UtilExport setOutputAttributes(OutputLevel level, OutputContextFunction context);
+            void _UtilExport setOutputAttributes(OutputLevel level, OutputContext context);
 
             template <class T>