Index: /trunk/psLib/src/sys/psType.h
===================================================================
--- /trunk/psLib/src/sys/psType.h	(revision 799)
+++ /trunk/psLib/src/sys/psType.h	(revision 800)
@@ -20,6 +20,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-26 00:05:17 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-28 03:15:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -57,39 +57,39 @@
 
 typedef enum {
-    PS_TYPE_INT8             = 0x101,   ///< Character.
-    PS_TYPE_INT16            = 0x102,   ///< Short integer.
-    PS_TYPE_INT32            = 0x104,   ///< Integer.
-    PS_TYPE_INT64            = 0x108,   ///< Long integer.
-    PS_TYPE_UINT8            = 0x301,   ///< Unsigned character.
-    PS_TYPE_UINT16           = 0x302,   ///< Unsigned short integer.
-    PS_TYPE_UINT32           = 0x304,   ///< Unsigned integer.
-    PS_TYPE_UINT64           = 0x308,   ///< Unsigned long integer.
-    PS_TYPE_FLOAT            = 0x404,   ///< Single-precision Floating point.
-    PS_TYPE_DOUBLE           = 0x408,   ///< Double-precision floating point.
-    PS_TYPE_COMPLEX_FLOAT    = 0x808,   ///< Complex numbers consisting of single-precision floating point.
-    PS_TYPE_COMPLEX_DOUBLE   = 0x810,   ///< Complex numbers consisting of double-precision floating point.
-    PS_TYPE_OTHER            = 0x000,   ///< Something else that's not supported for arithmetic.
+    PS_TYPE_INT8             = 0x0101,   ///< Character.
+    PS_TYPE_INT16            = 0x0102,   ///< Short integer.
+    PS_TYPE_INT32            = 0x0104,   ///< Integer.
+    PS_TYPE_INT64            = 0x0108,   ///< Long integer.
+    PS_TYPE_UINT8            = 0x0301,   ///< Unsigned character.
+    PS_TYPE_UINT16           = 0x0302,   ///< Unsigned short integer.
+    PS_TYPE_UINT32           = 0x0304,   ///< Unsigned integer.
+    PS_TYPE_UINT64           = 0x0308,   ///< Unsigned long integer.
+    PS_TYPE_FLOAT            = 0x0404,   ///< Single-precision Floating point.
+    PS_TYPE_DOUBLE           = 0x0408,   ///< Double-precision floating point.
+    PS_TYPE_COMPLEX_FLOAT    = 0x0808,   ///< Complex numbers consisting of single-precision floating point.
+    PS_TYPE_COMPLEX_DOUBLE   = 0x0810,   ///< Complex numbers consisting of double-precision floating point.
+    PS_TYPE_OTHER            = 0x0000,   ///< Something else that's not supported for arithmetic.
 
     // Abbreviated versions of the above types
-    PS_TYPE_S8               = 0x101,   ///< Character.
-    PS_TYPE_S16              = 0x102,   ///< Short integer.
-    PS_TYPE_S32              = 0x104,   ///< Integer.
-    PS_TYPE_S64              = 0x108,   ///< Long integer.
-    PS_TYPE_U8               = 0x301,   ///< Unsigned character.
-    PS_TYPE_U16              = 0x302,   ///< Unsigned short integer.
-    PS_TYPE_U32              = 0x304,   ///< Unsigned integer.
-    PS_TYPE_U64              = 0x308,   ///< Unsigned long integer.
-    PS_TYPE_F32              = 0x404,   ///< Single-precision Floating point.
-    PS_TYPE_F64              = 0x408,   ///< Double-precision floating point.
-    PS_TYPE_C32              = 0x808,   ///< Complex numbers consisting of single-precision floating point.
-    PS_TYPE_C64              = 0x810,   ///< Complex numbers consisting of double-precision floating point.
-    PS_TYPE_PTR              = 0x000    ///< Something else that's not supported for arithmetic.
+    PS_TYPE_S8               = 0x0101,   ///< Character.
+    PS_TYPE_S16              = 0x0102,   ///< Short integer.
+    PS_TYPE_S32              = 0x0104,   ///< Integer.
+    PS_TYPE_S64              = 0x0108,   ///< Long integer.
+    PS_TYPE_U8               = 0x0301,   ///< Unsigned character.
+    PS_TYPE_U16              = 0x0302,   ///< Unsigned short integer.
+    PS_TYPE_U32              = 0x0304,   ///< Unsigned integer.
+    PS_TYPE_U64              = 0x0308,   ///< Unsigned long integer.
+    PS_TYPE_F32              = 0x0404,   ///< Single-precision Floating point.
+    PS_TYPE_F64              = 0x0408,   ///< Double-precision floating point.
+    PS_TYPE_C32              = 0x0808,   ///< Complex numbers consisting of single-precision floating point.
+    PS_TYPE_C64              = 0x0810,   ///< Complex numbers consisting of double-precision floating point.
+    PS_TYPE_PTR              = 0x0000    ///< Something else that's not supported for arithmetic.
 
 } psElemType;
 
-#define IS_PSELEMTYPE_INT(x) (x & 0x100 == 0x100)
-#define IS_PSELEMTYPE_UNSIGNED(x) (x & 0x200 == 0x200)
-#define IS_PSELEMTYPE_REAL(x) (x & 0x400 == 0x400)
-#define IS_PSELEMTYPE_COMPLEX(x) (x & 0x800 == 0x800)
+#define IS_PSELEMTYPE_INT(x) ((x & 0x100) == 0x100)
+#define IS_PSELEMTYPE_UNSIGNED(x) ((x & 0x200) == 0x200)
+#define IS_PSELEMTYPE_REAL(x) ((x & 0x400) == 0x400)
+#define IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800)
 #define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) )
 
Index: /trunk/psLib/src/sysUtils/psType.h
===================================================================
--- /trunk/psLib/src/sysUtils/psType.h	(revision 799)
+++ /trunk/psLib/src/sysUtils/psType.h	(revision 800)
@@ -20,6 +20,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-26 00:05:17 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-28 03:15:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -57,39 +57,39 @@
 
 typedef enum {
-    PS_TYPE_INT8             = 0x101,   ///< Character.
-    PS_TYPE_INT16            = 0x102,   ///< Short integer.
-    PS_TYPE_INT32            = 0x104,   ///< Integer.
-    PS_TYPE_INT64            = 0x108,   ///< Long integer.
-    PS_TYPE_UINT8            = 0x301,   ///< Unsigned character.
-    PS_TYPE_UINT16           = 0x302,   ///< Unsigned short integer.
-    PS_TYPE_UINT32           = 0x304,   ///< Unsigned integer.
-    PS_TYPE_UINT64           = 0x308,   ///< Unsigned long integer.
-    PS_TYPE_FLOAT            = 0x404,   ///< Single-precision Floating point.
-    PS_TYPE_DOUBLE           = 0x408,   ///< Double-precision floating point.
-    PS_TYPE_COMPLEX_FLOAT    = 0x808,   ///< Complex numbers consisting of single-precision floating point.
-    PS_TYPE_COMPLEX_DOUBLE   = 0x810,   ///< Complex numbers consisting of double-precision floating point.
-    PS_TYPE_OTHER            = 0x000,   ///< Something else that's not supported for arithmetic.
+    PS_TYPE_INT8             = 0x0101,   ///< Character.
+    PS_TYPE_INT16            = 0x0102,   ///< Short integer.
+    PS_TYPE_INT32            = 0x0104,   ///< Integer.
+    PS_TYPE_INT64            = 0x0108,   ///< Long integer.
+    PS_TYPE_UINT8            = 0x0301,   ///< Unsigned character.
+    PS_TYPE_UINT16           = 0x0302,   ///< Unsigned short integer.
+    PS_TYPE_UINT32           = 0x0304,   ///< Unsigned integer.
+    PS_TYPE_UINT64           = 0x0308,   ///< Unsigned long integer.
+    PS_TYPE_FLOAT            = 0x0404,   ///< Single-precision Floating point.
+    PS_TYPE_DOUBLE           = 0x0408,   ///< Double-precision floating point.
+    PS_TYPE_COMPLEX_FLOAT    = 0x0808,   ///< Complex numbers consisting of single-precision floating point.
+    PS_TYPE_COMPLEX_DOUBLE   = 0x0810,   ///< Complex numbers consisting of double-precision floating point.
+    PS_TYPE_OTHER            = 0x0000,   ///< Something else that's not supported for arithmetic.
 
     // Abbreviated versions of the above types
-    PS_TYPE_S8               = 0x101,   ///< Character.
-    PS_TYPE_S16              = 0x102,   ///< Short integer.
-    PS_TYPE_S32              = 0x104,   ///< Integer.
-    PS_TYPE_S64              = 0x108,   ///< Long integer.
-    PS_TYPE_U8               = 0x301,   ///< Unsigned character.
-    PS_TYPE_U16              = 0x302,   ///< Unsigned short integer.
-    PS_TYPE_U32              = 0x304,   ///< Unsigned integer.
-    PS_TYPE_U64              = 0x308,   ///< Unsigned long integer.
-    PS_TYPE_F32              = 0x404,   ///< Single-precision Floating point.
-    PS_TYPE_F64              = 0x408,   ///< Double-precision floating point.
-    PS_TYPE_C32              = 0x808,   ///< Complex numbers consisting of single-precision floating point.
-    PS_TYPE_C64              = 0x810,   ///< Complex numbers consisting of double-precision floating point.
-    PS_TYPE_PTR              = 0x000    ///< Something else that's not supported for arithmetic.
+    PS_TYPE_S8               = 0x0101,   ///< Character.
+    PS_TYPE_S16              = 0x0102,   ///< Short integer.
+    PS_TYPE_S32              = 0x0104,   ///< Integer.
+    PS_TYPE_S64              = 0x0108,   ///< Long integer.
+    PS_TYPE_U8               = 0x0301,   ///< Unsigned character.
+    PS_TYPE_U16              = 0x0302,   ///< Unsigned short integer.
+    PS_TYPE_U32              = 0x0304,   ///< Unsigned integer.
+    PS_TYPE_U64              = 0x0308,   ///< Unsigned long integer.
+    PS_TYPE_F32              = 0x0404,   ///< Single-precision Floating point.
+    PS_TYPE_F64              = 0x0408,   ///< Double-precision floating point.
+    PS_TYPE_C32              = 0x0808,   ///< Complex numbers consisting of single-precision floating point.
+    PS_TYPE_C64              = 0x0810,   ///< Complex numbers consisting of double-precision floating point.
+    PS_TYPE_PTR              = 0x0000    ///< Something else that's not supported for arithmetic.
 
 } psElemType;
 
-#define IS_PSELEMTYPE_INT(x) (x & 0x100 == 0x100)
-#define IS_PSELEMTYPE_UNSIGNED(x) (x & 0x200 == 0x200)
-#define IS_PSELEMTYPE_REAL(x) (x & 0x400 == 0x400)
-#define IS_PSELEMTYPE_COMPLEX(x) (x & 0x800 == 0x800)
+#define IS_PSELEMTYPE_INT(x) ((x & 0x100) == 0x100)
+#define IS_PSELEMTYPE_UNSIGNED(x) ((x & 0x200) == 0x200)
+#define IS_PSELEMTYPE_REAL(x) ((x & 0x400) == 0x400)
+#define IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800)
 #define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) )
 
