Changeset 7161 in orxonox.OLD

Timestamp:

Feb 18, 2006, 3:34:57 PM (18 years ago)

Author:

bensch

Message:

trunk: one should again be able to use cout <<

File:

• trunk/src/defs/debug.h (modified) (3 diffs)

trunk/src/defs/debug.h

@@ -19 +19 @@
 
     There are two main modes HARD and SOFT. HARD is precessed during compileTime where SOFT is for runtime.
-    \li HARD: One can choose between different modes. see: // DEFINE_MODULES
-    \li SOFT: If you want each module can have its own variable for processing. just pass it to DEBUG_MODULE_SOFT
+    @li HARD: One can choose between different modes. see: // DEFINE_MODULES
+    @li SOFT: If you want each module can have its own variable for processing. just pass it to DEBUG_MODULE_SOFT
 */
 
@@ -115 +115 @@
 #ifndef NO_SHELL
 #define PRINT_EXEC       ShellBuffer::addBufferLineStatic
+#define COUT_EXEC        std::cout
 #else /* NO_SHELL */
 #define PRINT_EXEC       printf
+#define COUT_EXEC        std::cout
 #endif
 
@@ -237 +239 @@
   PRINT_EXEC
 
+
+
+////////////////////////////////////////////////////////
+///  COUT: just prints output as is with std::cout   ///
+////////////////////////////////////////////////////////
+#define COUTNO      COUT0
+#define COUTERR     COUT1
+#define COUTWARN    COUT2
+#define COUTINFO    COUT3
+#define COUTDEBUG   COUT4
+#define COUTVDEBUG  COUT5
+
+#ifdef  DEBUG
+#define COUT(x) \
+  COUT ## x
+
+#if HARD_DEBUG_LEVEL >= ERR
+#define COUT1  \
+  if (SOFT_DEBUG_LEVEL >= ERR)  \
+    COUT_EXEC
+#else
+#define COUT1 if (NO)\
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= WARN
+#define COUT2 \
+  if (SOFT_DEBUG_LEVEL >= WARN) \
+    COUT_EXEC
+
+#else
+#define COUT2 if (NO) \
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= INFO
+#define COUT3 \
+  if (SOFT_DEBUG_LEVEL >= INFO) \
+    COUT_EXEC
+#else
+#define COUT3 if (NO) \
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= DEBUG
+#define COUT4 \
+  if (SOFT_DEBUG_LEVEL >= DEBUG) \
+    COUT_EXEC
+#else
+#define COUT4 if (NO) \
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= vDEBUG
+#define COUT5 \
+     if (SOFT_DEBUG_LEVEL >= vDEBUG) \
+       COUT_EXEC
+#else
+#define COUT5 if (NO) \
+    COUT_EXEC
+#endif
+
+
+#else
+#define COUT(x) if (NO) \
+    COUT_EXEC
+#endif
+
+#define COUT0 \
+  COUT_EXEC
+
+
 #endif /* _DEBUG_H */