Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c
===================================================================
--- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c	(revision 1101)
+++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c	(revision 1102)
@@ -29,6 +29,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-25 23:34:06 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-26 00:04:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -340,27 +340,6 @@
 #define BINARY_TYPE(DIM1,DIM2,OUT,IN1,OP,IN2)                                                                \
 switch (IN1->type) {                                                                                         \
-case PS_TYPE_S8:                                                                                             \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S8);                                                                        \
-    break;                                                                                                   \
-case PS_TYPE_U8:                                                                                             \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U8);                                                                        \
-    break;                                                                                                   \
-case PS_TYPE_S16:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S16);                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_U16:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U16);                                                                       \
-    break;                                                                                                   \
 case PS_TYPE_S32:                                                                                            \
     DIM1##_##DIM2(OUT,IN1,OP,IN2,S32);                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_U32:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U32);                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_S64:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S64);                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_U64:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U64);                                                                       \
     break;                                                                                                   \
 case PS_TYPE_F32:                                                                                            \
@@ -373,8 +352,13 @@
     DIM1##_##DIM2(OUT,IN1,OP,IN2,C32);                                                                       \
     break;                                                                                                   \
+default:                                                                                                     \
+case PS_TYPE_S8:                                                                                             \
+case PS_TYPE_U8:                                                                                             \
+case PS_TYPE_S16:                                                                                            \
+case PS_TYPE_U16:                                                                                            \
+case PS_TYPE_U32:                                                                                            \
+case PS_TYPE_S64:                                                                                            \
+case PS_TYPE_U64:                                                                                            \
 case PS_TYPE_C64:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,C64);                                                                       \
-    break;                                                                                                   \
-default:                                                                                                     \
     psError(__func__, ": Invalid PS_TYPE: %d", IN1->type);                                                   \
 }
@@ -567,27 +551,6 @@
 #define UNARY_TYPE(DIM,OUT,IN,OP)                                                                            \
 switch (IN->type) {                                                                                          \
-case PS_TYPE_S8:                                                                                             \
-    DIM(OUT,IN,OP,S8);                                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_U8:                                                                                             \
-    DIM(OUT,IN,OP,U8);                                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_S16:                                                                                            \
-    DIM(OUT,IN,OP,S16);                                                                                      \
-    break;                                                                                                   \
-case PS_TYPE_U16:                                                                                            \
-    DIM(OUT,IN,OP,U16);                                                                                      \
-    break;                                                                                                   \
 case PS_TYPE_S32:                                                                                            \
     DIM(OUT,IN,OP,S32);                                                                                      \
-    break;                                                                                                   \
-case PS_TYPE_U32:                                                                                            \
-    DIM(OUT,IN,OP,U32);                                                                                      \
-    break;                                                                                                   \
-case PS_TYPE_S64:                                                                                            \
-    DIM(OUT,IN,OP,S64);                                                                                      \
-    break;                                                                                                   \
-case PS_TYPE_U64:                                                                                            \
-    DIM(OUT,IN,OP,U64);                                                                                      \
     break;                                                                                                   \
 case PS_TYPE_F32:                                                                                            \
@@ -600,9 +563,14 @@
     DIM(OUT,IN,OP,C32);                                                                                      \
     break;                                                                                                   \
+case PS_TYPE_S8:                                                                                             \
+case PS_TYPE_U8:                                                                                             \
+case PS_TYPE_S16:                                                                                            \
+case PS_TYPE_U16:                                                                                            \
+case PS_TYPE_U32:                                                                                            \
+case PS_TYPE_S64:                                                                                            \
+case PS_TYPE_U64:                                                                                            \
 case PS_TYPE_C64:                                                                                            \
-    DIM(OUT,IN,OP,C64);                                                                                      \
-    break;                                                                                                   \
 default:                                                                                                     \
-    psError(__func__, ": Line %d - Invalid PS_TYPE: %d", __LINE__, IN->type);                                \
+    psError(__func__, ": Invalid PS_TYPE: %d", IN->type);                                                    \
 }