Changeset 12290 for trunk/psLib/src/sys/psAssert.h

Timestamp:

Mar 6, 2007, 4:50:54 PM (19 years ago)

Author:

Paul Price

Message:

Allowing PS_ASSERT_INT_* to be used with any integer type (e.g., long).

File:

• trunk/psLib/src/sys/psAssert.h (modified) (11 diffs)

trunk/psLib/src/sys/psAssert.h

@@ -74 +74 @@
 if ((int)(NAME) < LOWER || (int)(NAME) > UPPER) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: %s, %d, is out of range.  Must be between %d and %d.", \
-            #NAME,(int)NAME,LOWER,UPPER); \
+            "Error: %s, %ld, is out of range.  Must be between %ld and %ld.", \
+            #NAME,(long)(NAME),(long)(LOWER),(long)(UPPER)); \
     return RVAL; \
 }
@@ -82 +82 @@
 if (!(VAR1 < VAR2)) { \
     psError(PS_ERR_UNKNOWN, true, \
-            "Error: %s is not less than %s (%d, %d)", #VAR1, #VAR2, VAR1, VAR2); \
+            "Error: %s is not less than %s (%ld, %ld)", #VAR1, #VAR2, (long)(VAR1), (long)(VAR2)); \
     return(RVAL); \
 }
@@ -89 +89 @@
 if (!(VAR1 <= VAR2)) { \
     psError(PS_ERR_UNKNOWN, true, \
-            "Error: %s is not less than %s (%d, %d)", #VAR1, #VAR2, VAR1, VAR2); \
+            "Error: %s is not less than %s (%ld, %ld)", #VAR1, #VAR2, (long)(VAR1), (long)(VAR2)); \
     return(RVAL); \
 }
@@ -96 +96 @@
 if (!((NAME1) > (NAME2))) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: !(%s > %s) (%d %d).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
+            "Error: !(%s > %s) (%ld %ld).", \
+            #NAME1, #NAME2,(long)(NAME1), long)(NAME2)); \
     return(RVAL); \
 }
@@ -104 +104 @@
 if (!((NAME1) >= (NAME2))) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: !(%s >= %s) (%d %d).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
+            "Error: !(%s >= %s) (%ld %ld).", \
+            #NAME1, #NAME2, (long)(NAME1), (long)(NAME2)); \
     return(RVAL); \
 }
@@ -111 +111 @@
 if (!((NAME1) > (NAME2))) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: !(%s > %s) (%f %f).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
+            "Error: !(%s > %s) (%lf %lf).", \
+            #NAME1, #NAME2, (double)(NAME1), (double)(NAME2)); \
     return(RVAL); \
 }
@@ -119 +119 @@
 if (!((NAME1) >= (NAME2))) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: !(%s >= %s) (%f %f).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
+            "Error: !(%s >= %s) (%lf %lf).", \
+            #NAME1, #NAME2, (double)(NAME1), (double)(NAME2)); \
     return(RVAL); \
 }
@@ -127 +127 @@
 if (!((NAME1) < (NAME2))) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: !(%s < %s) (%f %f).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
+            "Error: !(%s < %s) (%lf %lf).", \
+            #NAME1, #NAME2, (double)(NAME1), (double)(NAME2)); \
     return(RVAL); \
 }
@@ -135 +135 @@
 if (!((NAME1) <= (NAME2))) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: !(%s <= %s) (%f %f).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
+            "Error: !(%s <= %s) (%lf %lf).", \
+            #NAME1, #NAME2, (double)(NAME1), (double)(NAME2)); \
     return(RVAL); \
 }
@@ -160 +160 @@
 if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: %s, %f, is out of range.  Must be between %f and %f.", \
-            #NAME, NAME, LOWER, UPPER); \
+            "Error: %s, %f, is out of range.  Must be between %lf and %lf.", \
+            #NAME, NAME, (double)(LOWER), (double)(UPPER)); \
     return RVAL; \
 }
@@ -168 +168 @@
 if (!isfinite(NAME)) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: %s=%f is not a real value.\n", \
-            #NAME, NAME); \
+            "Error: %s=%lf is not a real value.\n", \
+            #NAME, (double)(NAME)); \
     return RVAL; \
 }