Changeset 8387

Timestamp:

Aug 16, 2006, 10:36:04 AM (20 years ago)

Author:

Paul Price

Message:

Putting brackets around macro parameters.

File:

• trunk/psLib/src/mathtypes/psVector.h (modified) (5 diffs)

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-16 20:36:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -295 +295 @@
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
             "psVector %s: bad type(%d)", \
-            #NAME, NAME->type.type); \
+            #NAME, (NAME)->type.type); \
     return(RVAL); \
 } \
@@ -303 +303 @@
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
             "psVector %s: bad type(%d)", \
-            #NAME, NAME->type.type); \
+            #NAME, (NAME)->type.type); \
     return(RVAL); \
 } \
@@ -316 +316 @@
 
 #define PS_ASSERT_VECTORS_SIZE_EQUAL(VEC1, VEC2, RVAL) \
-if (VEC1->n != VEC2->n) { \
+if ((VEC1)->n != (VEC2)->n) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
             "psVector %s has size %d, psVector %s has size %d.", \
-            #VEC1, VEC1->n, #VEC2, VEC2->n); \
+            #VEC1, (VEC1)->n, #VEC2, (VEC2)->n); \
     return(RVAL); \
 }
 
 #define PS_ASSERT_VECTOR_SIZE(VEC, SIZE, RVAL) \
-if (VEC->n != SIZE) { \
+if ((VEC)->n != (SIZE)) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
             "psVector %s has size %d, should be %d.", \
-            #VEC, VEC->n, SIZE); \
+            #VEC, (VEC)->n, (SIZE)); \
     return(RVAL); \
 }
 
 #define PS_ASSERT_VECTOR_TYPE_EQUAL(VEC1, VEC2, RVAL) \
-if (VEC1->type.type != VEC2->type.type) { \
+if ((VEC1)->type.type != (VEC2)->type.type) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
             "psVector %s has size %d, psVector %s has size %d.", \
-            #VEC1, VEC1->type.type, #VEC2, VEC2->type.type); \
+            #VEC1, (VEC1)->type.type, #VEC2, (VEC2)->type.type); \
     return(RVAL); \
 }
 
 #define PS_VECTOR_PRINT_F32(NAME) \
-if (NAME != NULL) { \
-    for (int my_i=0;my_i<(NAME)->n;my_i++) { \
-        printf("%s->data.F32[%d] is %f\n", #NAME, my_i, (NAME)->data.F32[my_i]); \
+if ((NAME) != NULL) { \
+    for (int i = 0; i < (NAME)->n; i++) { \
+        printf("%s->data.F32[%d] is %f\n", #NAME, i, (NAME)->data.F32[i]); \
     } \
     printf("\n"); \
@@ -350 +350 @@
 
 #define PS_VECTOR_PRINT_F64(NAME) \
-if (NAME != NULL) { \
-    for (int my_i=0;my_i<(NAME)->n;my_i++) { \
-        printf("%s->data.F64[%d] is %f\n", #NAME, my_i, (NAME)->data.F64[my_i]); \
+if ((NAME) != NULL) { \
+    for (int i = 0; i < (NAME)->n; i++) { \
+        printf("%s->data.F64[%d] is %f\n", #NAME, i, (NAME)->data.F64[i]); \
     } \
     printf("\n"); \