Changeset 4049 for trunk/psLib/src/dataManip/psConstants.h

Timestamp:

May 31, 2005, 11:25:27 AM (21 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/dataManip/psConstants.h (modified) (9 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 20:26:55 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-31 21:25:27 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -75 +75 @@
 }
 
-// Return an error if the arg is less than zero.
 #define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \
 if (NAME < 0) { \
@@ -83 +82 @@
 }
 
-// Return an error if the arg is less than zero.
-// XXX: This naming scheme is opposite most other macros.  This should be
-// corrected as soon as a fresh checkin/out can be performed.
-#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \
-if (NAME < 0) { \
-    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: %s is less than 0.", #NAME); \
-    return(RVAL); \
-}
-
-// Return an error if the arg is less than or equal to zero.
-// XXX: This naming scheme is opposite most other macros.  This should be
-// corrected as soon as a fresh checkin/out can be performed.
 #define PS_ASSERT_INT_POSITIVE(NAME, RVAL) \
 if (NAME < 1) { \
@@ -103 +89 @@
 }
 
-// Return an error if the arg is not equal to zero.
 #define PS_ASSERT_INT_ZERO(NAME, RVAL) \
 if (NAME != 0) { \
@@ -111 +96 @@
 }
 
-// Return an error if the arg is equal to zero.
 #define PS_ASSERT_INT_NONZERO(NAME, RVAL) \
 if (NAME == 0) { \
@@ -119 +103 @@
 }
 
-// Return an error if the arg is lies outside the supplied range.
 #define PS_ASSERT_INT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
 if ((int)NAME < LOWER || (int)NAME > UPPER) { \
@@ -129 +112 @@
 
 // Produce an error if (NAME1 > NAME2)
+// XXX: rename: ASSERT
 #define PS_INT_COMPARE(NAME1, NAME2, RVAL) \
 if (NAME1 > NAME2) { \
@@ -138 +122 @@
 
 // Produce an error if ((NAME1 > NAME2)
+// XXX: rename: ASSERT
 #define PS_FLOAT_COMPARE(NAME1, NAME2, RVAL) \
 if (NAME1 > NAME2) { \
@@ -272 +257 @@
             "psVector %s has size %d, psVector %s has size %d.", \
             #VEC1, VEC1->n, #VEC2, VEC2->n); \
+    return(RVAL); \
+}
+
+#define PS_ASSERT_VECTOR_SIZE(VEC, SIZE, RVAL) \
+if (VEC->n != SIZE) { \
+    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
+            "psVector %s has size %d, should be %d." \
+            #VEC, VEC->n, SIZE); \
     return(RVAL); \
 }