[Orxonox-commit 4108] r8779 - in code/branches/output/src/libraries/util: . output

[landauf at orxonox.net]

Author: landauf
Date: 2011-07-25 18:28:57 +0200 (Mon, 25 Jul 2011)
New Revision: 8779

Modified:
   code/branches/output/src/libraries/util/Output.h
   code/branches/output/src/libraries/util/output/OutputStream.cc
   code/branches/output/src/libraries/util/output/OutputStream.h
Log:
small changes regarding context functions and orxout()

Modified: code/branches/output/src/libraries/util/Output.h
===================================================================
--- code/branches/output/src/libraries/util/Output.h	2011-07-25 13:00:29 UTC (rev 8778)
+++ code/branches/output/src/libraries/util/Output.h	2011-07-25 16:28:57 UTC (rev 8779)
@@ -34,17 +34,23 @@
 
 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;
         stream.setOutputAttributes(level, context);
         return stream;
     }
+
+    inline OutputStream& orxout(OutputLevel level, OutputContextFunction context)
+    {
+        return orxout(level, context());
+    }
 }
 }
 

Modified: code/branches/output/src/libraries/util/output/OutputStream.cc
===================================================================
--- code/branches/output/src/libraries/util/output/OutputStream.cc	2011-07-25 13:00:29 UTC (rev 8778)
+++ code/branches/output/src/libraries/util/output/OutputStream.cc	2011-07-25 16:28:57 UTC (rev 8779)
@@ -47,10 +47,10 @@
         this->str("");
     }
 
-    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_);
     }

Modified: code/branches/output/src/libraries/util/output/OutputStream.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputStream.h	2011-07-25 13:00:29 UTC (rev 8778)
+++ code/branches/output/src/libraries/util/output/OutputStream.h	2011-07-25 16:28:57 UTC (rev 8779)
@@ -46,7 +46,7 @@
         public:
             _UtilExport OutputStream();
 
-            void _UtilExport setOutputAttributes(OutputLevel level, OutputContextFunction context);
+            void _UtilExport setOutputAttributes(OutputLevel level, OutputContext context);
 
             template <class T>
             inline OutputStream& operator<<(const T& val) { return this->output(val); }