Changeset 6186 for trunk/psLib/src/math/psConstants.h

Timestamp:

Jan 23, 2006, 12:25:31 PM (20 years ago)

Author:

gusciora

Message:

Misc code cleaning

File:

• trunk/psLib/src/math/psConstants.h (modified) (4 diffs)

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-23 23:54:43 $
+ *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 22:25:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -14 +14 @@
  *       called with complex expressions.
  *
- *  XXX: All functions which use the PS_CHECK macros must be scrutinized so
+ *  XXX: All functions which use the PS_ASSERT macros must be scrutinized so
  *  that we ensure that an argument which is expected to be output is
  *  psFree'ed before reurning NULL.
@@ -21 +21 @@
  *  throw a psError if the CONDITION is true.  However, some throw the error
  *  if the CONDITION is false.  This should be consistant.
- *
- *  XXX: rename all these with form PS_ASSERT_CONDITION().
  *
  */
@@ -156 +154 @@
 }
 
-// Produce an error if (NAME1 > NAME2)
-// XXX: Get rid of this, use above macros.
-#define PS_INT_COMPARE(NAME1, NAME2, RVAL) \
-if ((NAME1) > (NAME2)) { \
-    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: (%s > %s) (%d %d).", \
-            #NAME1, #NAME2, NAME1, NAME2); \
-    return(RVAL); \
-}
-
-// Produce an error if ((NAME1 > NAME2)
-// XXX: Get rid of this, use above macros.
-#define PS_FLOAT_COMPARE(NAME1, NAME2, RVAL) \
-if ((NAME1) > (NAME2)) { \
-    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: (%s > %s) (%f %f)", \
-            #NAME1, #NAME2, NAME1, NAME2); \
-    return(RVAL); \
-}
-
 #define PS_ASSERT_FLOAT_NON_EQUAL(NAME1, NAME2, RVAL) \
 if (fabs((NAME2) - (NAME1)) < FLT_EPSILON) { \