Changeset 5991 for code/branches/console/src/libraries/util/OutputHandler.h

Timestamp:

Oct 24, 2009, 11:35:31 PM (16 years ago)

Author:

rgrieder

Message:

Replaced the load of macros in Debug.h with just two, doing almost exactly the same. The only difference is that the compiler can now completely eliminate COUT with a level higher than the hard debug level.

File:

• code/branches/console/src/libraries/util/OutputHandler.h (modified) (3 diffs)

code/branches/console/src/libraries/util/OutputHandler.h

@@ -48 +48 @@
 namespace orxonox
 {
+    namespace OutputLevel
+    {
+        enum Value
+        {
+            None    = 0,
+            Error   = 1,
+            Warning = 2,
+            Info    = 3,
+            Debug   = 4,
+            Verbose = 5,
+            Ultra   = 6,
+        };
+    }
+
     //! The OutputHandler acts like std::cout, but redirects output to the console, the logfile and the ingame shell.
     class _UtilExport OutputHandler
@@ -61 +75 @@
 
             static OutputHandler& getOutStream();
+            static inline OutputHandler& getOutStream(int level)
+                { return OutputHandler::getOutStream().setOutputLevel(level); }
 
             /** @brief Puts some text on the outstream. @param text The text */
@@ -142 +158 @@
             OutputHandler& operator<<(std::ios& (*manipulator)(std::ios&));
             OutputHandler& operator<<(std::ios_base& (*manipulator)(std::ios_base&));
+
+            /** @brief Dummy operator required by Debug.h for the ternary operator */
+            inline operator int() { return 0; }
 
         private: