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

Timestamp:

Oct 26, 2004, 3:15:47 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:15:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -94 +94 @@
 
 /** Preprocessor macro to generate error on an incorrect type */
-#define PS_CHECK_VECTOR_TYPE_RETURN_NULL(NAME, TYPE) \
+#define PS_CHECK_VECTOR_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(__func__,"Unallowable operation: %s has incorrect type.", #NAME); \
-    return(NULL); \
+    return(RVAL); \
 }
 
 /** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR_RETURN_NULL(NAME) \
+#define PS_CHECK_NULL_VECTOR(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
-    return(NULL); \
-} \
-
-/** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR_RETURN_F0(NAME) \
-if (NAME == NULL || NAME->data.V == NULL) { \
-    psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
-    return(0.0); \
+    return(RVAL); \
 } \
 
 /** Preprocessor macro to generate error on a NULL poniter */
-#define PS_CHECK_NULL_PTR_RETURN_NULL(NAME) \
+#define PS_CHECK_NULL_PTR(NAME, RVAL) \
 if (NAME == NULL) { \
     psError(__func__,"Unallowable operation: %s is NULL.", #NAME); \
-    return(NULL); \
-}
-
-/** Preprocessor macro to generate error on a NULL poniter */
-#define PS_CHECK_NULL_PTR_RETURN_F0(NAME) \
-if (NAME == NULL) { \
-    psError(__func__,"Unallowable operation: %s is NULL.", #NAME); \
-    return(0.0); \
-}
-
-/** Preprocessor macro to generate error on a NULL poniter */
-#define PS_CHECK_NULL_PTR_RETURN_ZERO(NAME) \
-if (NAME == NULL) { \
-    psError(__func__,"Unallowable operation: %s is NULL.", #NAME); \
-    return(0); \
-}
+    return(RVAL); \
+}
+
+
 
 /** Preprocessor macro to generate error for zero length vector */