Changeset 12433

Timestamp:

Mar 13, 2007, 4:35:02 PM (19 years ago)

Author:

magnier

Message:

changing PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL to PS_ASSERT_GENERAL_PTR_TYPE_EQUAL for consistency

Location:

trunk/psLib/src

Files:

• math/psBinaryOp.c (modified) (2 diffs)
• sys/psAssert.h (modified) (1 diff)

trunk/psLib/src/math/psBinaryOp.c

@@ -30 +30 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-14 00:39:50 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-14 02:35:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -395 +395 @@
     PS_ASSERT_GENERAL_PTR_NON_NULL(op, psBinaryOp_EXIT);
 
-    PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(input1,input2, psBinaryOp_EXIT);
+    PS_ASSERT_GENERAL_PTR_TYPE_EQUAL(input1,input2, psBinaryOp_EXIT);
 
     PS_ASSERT_PTR_DIMEN_GENERAL_NOT(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT);

trunk/psLib/src/sys/psAssert.h

@@ -256 +256 @@
 }
 
-#define PS_ASSERT_PTR_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL)
-#define PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \
+#define PS_ASSERT_PTR_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_ASSERT_GENERAL_PTR_TYPE_EQUAL(PTR1, PTR2, return RVAL)
+#define PS_ASSERT_GENERAL_PTR_TYPE_EQUAL(PTR1, PTR2, CLEANUP) \
 if (PTR1->type.type != PTR2->type.type) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \