Changeset 3550 for trunk/kStuff/include/k/kHlpAssert.h

Timestamp:

Aug 26, 2007, 3:13:35 AM (18 years ago)

Author:

bird

Message:

made kDbg compile again (not linking yet though).

File:

• trunk/kStuff/include/k/kHlpAssert.h (modified) (2 diffs)

trunk/kStuff/include/k/kHlpAssert.h

@@ -73 +73 @@
     } while (0)
 
+# define kHlpAssertReturnVoid(expr) \
+    do { \
+        if (!(expr)) \
+        { \
+            kHlpAssertMsg1(#expr, __FILE__, __LINE__, __FUNCTION__); \
+            kHlpAssertBreakpoint(); \
+            return; \
+        }
+    } while (0)
+
 # define kHlpAssertMsg(expr, msg) \
     do { \
@@ -94 +104 @@
     } while (0)
 
+# define kHlpAssertMsgReturnVoid(expr, msg) \
+    do { \
+        if (!(expr)) \
+        { \
+            kHlpAssertMsg1(#expr, __FILE__, __LINE__, __FUNCTION__); \
+            kHlpAssertMsg2 msg; \
+            kHlpAssertBreakpoint(); \
+            return; \
+        }
+    } while (0)
+
 #else   /* !K_STRICT */
 # define kHlpAssert(expr)                       do { } while (0)
 # define kHlpAssertReturn(expr, rcRet)          do { if (!(expr)) return (rcRet); } while (0)
+# define kHlpAssertReturnVoid(expr)             do { if (!(expr)) return; } while (0)
 # define kHlpAssertMsg(expr, msg)               do { } while (0)
 # define kHlpAssertMsgReturn(expr, msg, rcRet)  do { if (!(expr)) return (rcRet); } while (0)
+# define kHlpAssertMsgReturnVoid(expr, msg)     do { if (!(expr)) return; } while (0)
 #endif  /* !K_STRICT */
 
 #define kHlpAssertPtr(ptr)                      kHlpAssertMsg(K_VALID_PTR(ptr), ("%s = %p\n", #ptr, (ptr)))
 #define kHlpAssertPtrReturn(ptr, rcRet)         kHlpAssertMsgReturn(K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)), (rcRet))
+#define kHlpAssertPtrReturnVoid(ptr)            kHlpAssertMsgReturnVoid(K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)))
 #define kHlpAssertPtrNull(ptr)                  kHlpAssertMsg(!(ptr) || K_VALID_PTR(ptr), ("%s = %p\n", #ptr, (ptr)))
 #define kHlpAssertPtrNullReturn(ptr, rcRet)     kHlpAssertMsgReturn(!(ptr) || K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)), (rcRet))
+#define kHlpAssertPtrNullReturnVoid(ptr)        kHlpAssertMsgReturnVoid(!(ptr) || K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)))
 #define kHlpAssertRC(rc)                        kHlpAssertMsg((rc) == 0, ("%s = %d\n", #rc, (rc)))
 #define kHlpAssertRCReturn(rc, rcRet)           kHlpAssertMsgReturn((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)), (rcRet))
+#define kHlpAssertRCReturnVoid(rc)              kHlpAssertMsgReturnVoid((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)))
 #define kHlpAssertFailed()                      kHlpAssert(0)
 #define kHlpAssertFailedReturn(rcRet)           kHlpAssertReturn(0, (rcRet))
+#define kHlpAssertFailedReturnVoid()            kHlpAssertReturnVoid(0)
 #define kHlpAssertMsgFailed(msg)                kHlpAssertMsg(0, msg)
 #define kHlpAssertMsgFailedReturn(msg, rcRet)   kHlpAssertMsgReturn(0, msg, (rcRet))
+#define kHlpAssertMsgFailedReturnVoid(msg)      kHlpAssertMsgReturnVoid(0, msg))
 
 /**