Changeset 5075 in orxonox.OLD for trunk/src/defs

Timestamp:

Aug 19, 2005, 3:21:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: redirected all printf-output to the shell
This is just for testing purposes, and will be changed again in the future (perhaps)

Location:

trunk/src/defs

Files:

• debug.h (modified) (14 diffs)
• stdincl.h (modified) (2 diffs)

trunk/src/defs/debug.h

@@ -27 +27 @@
 
 #include "confincl.h"
+#include "shell.h"
 
 #include <stdio.h>
@@ -97 +98 @@
 #define PRINTFVDEBUG  PRINTF5
 
+//#ifdef
+//#define PRINTF(x)        PRINT(x)
+#define PRINT_EXEC       Shell::addBufferLineStatic
+
 #ifdef DEBUG
 
@@ -105 +110 @@
 #define PRINTF1 \
     if (SOFT_DEBUG_LEVEL >= ERR) \
-      printf("ERROR::%s:%d:", __FILE__, __LINE__) && printf
+      printf("ERROR::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
 #define PRINTF1 if (NO)
@@ -113 +118 @@
 #define PRINTF2 \
      if (SOFT_DEBUG_LEVEL >= WARN) \
-       printf("WARNING::%s:%d:", __FILE__, __LINE__) && printf
+       printf("WARNING::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 
 #else
@@ -122 +127 @@
 #define PRINTF3 \
      if (SOFT_DEBUG_LEVEL >= INFO) \
-       printf("INFO::%s:%d:", __FILE__, __LINE__) && printf
+       printf("INFO::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
 #define PRINTF3 if (NO)
@@ -130 +135 @@
 #define PRINTF4 \
      if (SOFT_DEBUG_LEVEL >= DEBUG) \
-       printf("DEBUG::%s:%d:", __FILE__, __LINE__) && printf
+       printf("DEBUG::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
 #define PRINTF4 if (NO)
@@ -138 +143 @@
 #define PRINTF5 \
      if (SOFT_DEBUG_LEVEL >= vDEBUG) \
-       printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
+       printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
 #define PRINTF5 if (NO)
@@ -148 +153 @@
 
 #define PRINTF0 \
-    printf("%s:%d::", __FILE__, __LINE__) && printf
+    printf("%s:%d::", __FILE__, __LINE__) && PRINT_EXEC
 
 
@@ -168 +173 @@
 #define PRINT1  \
   if (SOFT_DEBUG_LEVEL >= ERR)  \
-    printf
+    PRINT_EXEC
 #else
 #define PRINT1 if (NO)
@@ -176 +181 @@
 #define PRINT2 \
   if (SOFT_DEBUG_LEVEL >= WARN) \
-    printf
+    PRINT_EXEC
 
 #else
@@ -185 +190 @@
 #define PRINT3 \
   if (SOFT_DEBUG_LEVEL >= INFO) \
-    printf
+    PRINT_EXEC
 #else
 #define PRINT3 if (NO)
@@ -193 +198 @@
 #define PRINT4 \
   if (SOFT_DEBUG_LEVEL >= DEBUG) \
-    printf
+    PRINT_EXEC
 #else
 #define PRINT4 if (NO)
@@ -201 +206 @@
 #define PRINT5 \
      if (SOFT_DEBUG_LEVEL >= vDEBUG) \
-       printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
+       PRINT_EXEC("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
 #define PRINT5 if (NO)
@@ -212 +217 @@
 
 #define PRINT0 \
-  printf
+  PRINT_EXEC
 
 #endif /* _DEBUG_H */

trunk/src/defs/stdincl.h

@@ -2 +2 @@
   \file stdincl.h
   \brief This file includes default headers that nearly every Class needs.
-  
+
   no Class is defined here, but many headers to classes, and more general Headers like the openGL-header.
 */
@@ -23 +23 @@
 
 #include "error.h"
-#include "debug.h"
 #include "globals.h"