Index: trunk/psLib/src/math/psBinaryOp.c
===================================================================
--- trunk/psLib/src/math/psBinaryOp.c	(revision 9551)
+++ trunk/psLib/src/math/psBinaryOp.c	(revision 9552)
@@ -30,6 +30,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 04:34:28 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 00:02:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -423,6 +423,6 @@
     PS_ASSERT_PTR_DIMEN_GENERAL_NOT(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT);
 
-    psType* psType1 = (psType*)in1;
-    psType* psType2 = (psType*)in2;
+    psMathType* psType1 = (psMathType*)in1;
+    psMathType* psType2 = (psMathType*)in2;
     psDimen dim1 = psType1->dimen;
     psDimen dim2 = psType2->dimen;
@@ -451,5 +451,5 @@
 
     if (dim1 == PS_DIMEN_SCALAR) {
-        if ( out != NULL && ((psType*)out)->dimen != dim2) {
+        if ( out != NULL && ((psMathType*)out)->dimen != dim2) {
             if (out != in1 && out != in2) {
                 psFree(out);
Index: trunk/psLib/src/math/psUnaryOp.c
===================================================================
--- trunk/psLib/src/math/psUnaryOp.c	(revision 9551)
+++ trunk/psLib/src/math/psUnaryOp.c	(revision 9552)
@@ -30,6 +30,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 04:34:28 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 00:02:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -291,5 +291,5 @@
                            }
 
-    psType* psTypeIn = (psType* ) in;
+    psMathType* psTypeIn = (psMathType* ) in;
 
     PS_ASSERT_GENERAL_PTR_NON_NULL(in, psUnaryOp_EXIT);
@@ -299,5 +299,5 @@
     case PS_DIMEN_SCALAR:
         if (out == NULL ||
-                ((psType*)out)->dimen != PS_DIMEN_SCALAR ||
+                ((psMathType*)out)->dimen != PS_DIMEN_SCALAR ||
                 ((psScalar*)out)->type.type != psTypeIn->type) {
             psFree(out);
Index: trunk/psLib/src/sys/psType.h
===================================================================
--- trunk/psLib/src/sys/psType.h	(revision 9551)
+++ trunk/psLib/src/sys/psType.h	(revision 9552)
@@ -10,6 +10,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-07-14 02:26:25 $
+*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-14 00:02:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -283,11 +283,4 @@
 typedef struct
 {
-    psElemType type;                   ///< Primitive type.
-    psDimen dimen;                     ///< Dimensionality.
-}
-psType;
-
-typedef struct
-{
     psElemType type;                   ///< The type
     psDimen dimen;                     ///< The dimensionality.