Changeset 4373 in orxonox.OLD

Timestamp:

May 29, 2005, 10:50:14 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better definition of debug.h

File:

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

orxonox/trunk/src/defs/debug.h

@@ -35 +35 @@
 #define WARN            2
 #define INFO            3
-#define DEBUGING        4
-#define vDEBUGING       5
+#define DEBUG           4
+#define vDEBUG          5
 
 extern int verbose;
@@ -82 +82 @@
 #endif /* DEBUG_SPECIAL_MODULE */
 #endif /* MODULAR_DEBUG */
+
 ///////////////////////////////////////////////////
 /// PRINTF: prints with filename and linenumber ///
 ///////////////////////////////////////////////////
+#define PRINTFNO      PRINTF0
+#define PRINTFERR     PRINTF1
+#define PRINTFWARN    PRINTF2
+#define PRINTFINFO    PRINTF3
+#define PRINTFDEBUG   PRINTF4
+#define PRINTFVDEBUG  PRINTF5
 
 #ifdef DEBUG
@@ -116 +123 @@
 #endif
      
-#if HARD_DEBUG_LEVEL >= DEBUGING
+#if HARD_DEBUG_LEVEL >= DEBUG
 #define PRINTF4 \
-     if (SOFT_DEBUG_LEVEL >= DEBUGING) \
+     if (SOFT_DEBUG_LEVEL >= DEBUG) \
        printf("DEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -124 +131 @@
 #endif
      
-#if HARD_DEBUG_LEVEL >= vDEBUGING
+#if HARD_DEBUG_LEVEL >= vDEBUG
 #define PRINTF5 \
-     if (SOFT_DEBUG_LEVEL >= vDEBUGING) \
+     if (SOFT_DEBUG_LEVEL >= vDEBUG) \
        printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -143 +150 @@
 ///  PRINT: just prints output as is            ///
 ///////////////////////////////////////////////////
+#define PRINTNO      PRINT0
+#define PRINTERR     PRINT1
+#define PRINTWARN    PRINT2
+#define PRINTINFO    PRINT3
+#define PRINTDEBUG   PRINT4
+#define PRINTVDEBUG  PRINT5
+
 #ifdef  DEBUG
 #define PRINT(x) \
@@ -172 +186 @@
 #endif
 
-#if HARD_DEBUG_LEVEL >= DEBUGING
+#if HARD_DEBUG_LEVEL >= DEBUG
 #define PRINT4 \
-  if (SOFT_DEBUG_LEVEL >= DEBUGING) \
+  if (SOFT_DEBUG_LEVEL >= DEBUG) \
     printf
 #else 
@@ -180 +194 @@
 #endif
 
-#if HARD_DEBUG_LEVEL >= vDEBUGING
+#if HARD_DEBUG_LEVEL >= vDEBUG
 #define PRINT5 \
-     if (SOFT_DEBUG_LEVEL >= vDEBUGING) \
+     if (SOFT_DEBUG_LEVEL >= vDEBUG) \
        printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -196 +210 @@
   printf
 
-///////////////////////////////////////////////////
-/// COUT: simple cout print with verbose-check  ///
-///////////////////////////////////////////////////
-#ifdef  DEBUG
-#define COUT(x) \
-           COUT ## x
-
-#if HARD_DEBUG_LEVEL >= 1
-#define COUT1 \
-    if (SOFT_DEBUG_LEVEL >= 1 ) \
-      cout
-#else 
-#define COUT1 if (NO) cout
-#endif
-     
-#if HARD_DEBUG_LEVEL >= 2
-#define COUT2 \
-     if (SOFT_DEBUG_LEVEL >= 2 ) \
-       cout
-
-#else 
-#define COUT2 if (NO) cout
-#endif
-     
-#if HARD_DEBUG_LEVEL >= 3
-#define COUT3 \
-     if (SOFT_DEBUG_LEVEL >= 3 ) \
-       cout
-#else
-#define COUT3 if (NO) cout
-#endif
-     
-#if HARD_DEBUG_LEVEL >= 4
-#define COUT4 \
-     if (SOFT_DEBUG_LEVEL >= 4 ) \
-       cout
-#else 
-#define COUT4 if (NO) cout
-#endif
-     
-     
-#else  
-#define COUT(x) if (NO) cout
-#endif
-
-#define COUT0 \
-           cout
-
 #endif /* _DEBUG_H */