Changeset 6417 for code/trunk/src/libraries/util/Debug.h

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/util/Debug.h (modified) (3 diffs)

code/trunk/src/libraries/util/Debug.h

@@ -71 +71 @@
     using std::endl;
 
-    //! Adjust to discard certain output with level > hardDebugLevel at compile time
+    // Adjust this to discard certain output with level > hardDebugLevel at compile time already
+#ifdef ORXONOX_RELEASE
+    const int hardDebugLevel = OutputLevel::Verbose
+#elif defined(NDEBUG)
     const int hardDebugLevel = OutputLevel::Verbose;
+#else
+    //! Maximum level for debug output that should be even processed at run time
+    const int hardDebugLevel = OutputLevel::Ultra;
+#endif
+
+    //! This function simply returns 0 and helps to suppress the "statement has no effect" compiler warning
+    inline int debugDummyFunction()
+    {
+        return 0;
+    }
 }
 
@@ -79 +92 @@
     Logs text output: use exactly like std::cout, but specify an output
     level as argument.
+@details
+    (a > b ? 0 : c << "text") is equivalent to (a > b ? 0 : (c << "text"))
+    where (a > b ? 0 : ) stands for COUT(x). This should explain how
+    this macro magic can possibly even work ;)
 @example
     COUT(3) << "Some info" << std::endl;
@@ -88 +105 @@
 #define COUT(level)                                                    \
     /*if*/ (level > orxonox::hardDebugLevel) ?                         \
-        0                                                              \
+        orxonox::debugDummyFunction()                                  \
     /*else*/ :                                                         \
         /*if*/ (level > orxonox::OutputHandler::getSoftDebugLevel()) ? \
-            0                                                          \
+            orxonox::debugDummyFunction()                              \
         /*else*/ :                                                     \
             orxonox::OutputHandler::getOutStream(level)