Changeset 1593 for code/branches/core3/src

Timestamp:

Jun 12, 2008, 4:48:35 AM (16 years ago)

Author:

landauf

Message:

changed COUT(x) macros to use trinary ?: operator instead of if (…) to avoid problems with nested calls like this:

if (true)

COUT(4) << "DEBUG!" << std::endl;

else

COUT(1) << "ERROR!" << std::endl;

This used to return "ERROR!" if the configured debuglevel was < 4 because of the internal structure of the macro, that turned the above code into something like this:

if (true)

if (configured-debuglevel ≥ 4)

std::cout << "DEBUG!" << std::endl;

else

if (configured-debuglevel ≥ 1)

std::cout << "ERROR!" << std::endl;

But with the changed macro it's like this:

if (true)

(configured-debuglevel ≥ 4) ? std::cout : std::cout << "DEBUG!" << std::endl;

else

(configured-debuglevel ≥ 1) ? std::cout : std::cout << "ERROR!" << std::endl;

…and therefore everything works perfectly fine.

File:

• code/branches/core3/src/util/Debug.h (modified) (8 diffs)

code/branches/core3/src/util/Debug.h

@@ -87 +87 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_NONE
    #define COUT0  \
-    if (getSoftDebugLevel() >= ORX_NONE)  \
-     COUT_EXEC(0)
+    (getSoftDebugLevel() < ORX_NONE) ? COUT_EXEC(0) : COUT_EXEC(0)
   #else
    #define COUT0 \
@@ -96 +95 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ERROR
    #define COUT1  \
-    if (getSoftDebugLevel() >= ORX_ERROR)  \
-     COUT_EXEC(1)
+    (getSoftDebugLevel() < ORX_ERROR) ? COUT_EXEC(1) : COUT_EXEC(1)
   #else
    #define COUT1 \
@@ -105 +103 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_WARNING
    #define COUT2 \
-    if (getSoftDebugLevel() >= ORX_WARNING) \
-     COUT_EXEC(2)
+    (getSoftDebugLevel() < ORX_WARNING) ? COUT_EXEC(2) : COUT_EXEC(2)
   #else
    #define COUT2 \
@@ -114 +111 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_INFO
    #define COUT3 \
-    if (getSoftDebugLevel() >= ORX_INFO) \
-     COUT_EXEC(3)
+    (getSoftDebugLevel() < ORX_INFO) ? COUT_EXEC(3) : COUT_EXEC(3)
   #else
    #define COUT3 \
@@ -123 +119 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_DEBUG
    #define COUT4 \
-    if (getSoftDebugLevel() >= ORX_DEBUG) \
-     COUT_EXEC(4)
+    (getSoftDebugLevel() < ORX_DEBUG) ? COUT_EXEC(4) : COUT_EXEC(4)
   #else
    #define COUT4 \
@@ -132 +127 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_VERBOSE
    #define COUT5 \
-    if (getSoftDebugLevel() >= ORX_VERBOSE) \
-     COUT_EXEC(5)
+    (getSoftDebugLevel() < ORX_VERBOSE) ? COUT_EXEC(5) : COUT_EXEC(5)
   #else
    #define COUT5 \
@@ -141 +135 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ULTRA
    #define COUT6 \
-    if (getSoftDebugLevel() >= ORX_ULTRA) \
-     COUT_EXEC(6)
+    (getSoftDebugLevel() < ORX_ULTRA) ? COUT_EXEC(6) : COUT_EXEC(6)
   #else
    #define COUT6 \
@@ -178 +171 @@
   #if ORX_HARD_DEBUG_LEVEL >= ORX_NONE
    #define CCOUT0  \
-    if (getSoftDebugLevel() >= ORX_NONE)  \
-     CCOUT_EXEC(0)
+    (getSoftDebugLevel() < ORX_NONE) ? COUT_EXEC(0) : CCOUT_EXEC(0)
   #else
    #define CCOUT0 \
-    false ? CCOUT_EXEC(0) : CCOUT_EXEC(0)
+    false ? COUT_EXEC(0) : CCOUT_EXEC(0)
   #endif
 
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ERROR
    #define CCOUT1  \
-    if (getSoftDebugLevel() >= ORX_ERROR)  \
-     CCOUT_EXEC(1)
+    (getSoftDebugLevel() < ORX_ERROR) ? COUT_EXEC(1) : CCOUT_EXEC(1)
   #else
    #define CCOUT1 \
-    false ? CCOUT_EXEC(1) : CCOUT_EXEC(1)
+    false ? COUT_EXEC(1) : CCOUT_EXEC(1)
   #endif
 
   #if ORX_HARD_DEBUG_LEVEL >= ORX_WARNING
    #define CCOUT2 \
-    if (getSoftDebugLevel() >= ORX_WARNING) \
-     CCOUT_EXEC(2)
+    (getSoftDebugLevel() < ORX_WARNING) ? COUT_EXEC(2) : CCOUT_EXEC(2)
   #else
    #define CCOUT2 \
-    false ? CCOUT_EXEC(2) : CCOUT_EXEC(2)
+    false ? COUT_EXEC(2) : CCOUT_EXEC(2)
   #endif
 
   #if ORX_HARD_DEBUG_LEVEL >= ORX_INFO
    #define CCOUT3 \
-    if (getSoftDebugLevel() >= ORX_INFO) \
-     CCOUT_EXEC(3)
+    (getSoftDebugLevel() < ORX_INFO) ? COUT_EXEC(3) : CCOUT_EXEC(3)
   #else
    #define CCOUT3 \
-    false ? CCOUT_EXEC(3) : CCOUT_EXEC(3)
+    false ? COUT_EXEC(3) : CCOUT_EXEC(3)
   #endif
 
   #if ORX_HARD_DEBUG_LEVEL >= ORX_DEBUG
    #define CCOUT4 \
-    if (getSoftDebugLevel() >= ORX_DEBUG) \
-     CCOUT_EXEC(4)
+    (getSoftDebugLevel() < ORX_DEBUG) ? COUT_EXEC(4) : CCOUT_EXEC(4)
   #else
    #define CCOUT4 \
-    false ? CCOUT_EXEC(4) : CCOUT_EXEC(4)
+    false ? COUT_EXEC(4) : CCOUT_EXEC(4)
   #endif
 
   #if ORX_HARD_DEBUG_LEVEL >= ORX_VERBOSE
    #define CCOUT5 \
-    if (getSoftDebugLevel() >= ORX_VERBOSE) \
-     CCOUT_EXEC(5)
+    (getSoftDebugLevel() < ORX_VERBOSE) ? COUT_EXEC(5) : CCOUT_EXEC(5)
   #else
    #define CCOUT5 \
-    false ? CCOUT_EXEC(5) : CCOUT_EXEC(5)
+    false ? COUT_EXEC(5) : CCOUT_EXEC(5)
   #endif
 
   #if ORX_HARD_DEBUG_LEVEL >= ORX_ULTRA
    #define CCOUT6 \
-    if (getSoftDebugLevel() >= ORX_ULTRA) \
-     CCOUT_EXEC(6)
+    (getSoftDebugLevel() < ORX_ULTRA) ? COUT_EXEC(6) : CCOUT_EXEC(6)
   #else
    #define CCOUT6 \
-    false ? CCOUT_EXEC(6) : CCOUT_EXEC(6)
+    false ? COUT_EXEC(6) : CCOUT_EXEC(6)
   #endif