Index: trunk/psLib/test/collections/tst_psBitSet.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet.c	(revision 1807)
+++ trunk/psLib/test/collections/tst_psBitSet.c	(revision 2204)
@@ -17,6 +17,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-09-14 20:01:52 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,12 +27,12 @@
 #include "psTest.h"
 
-static int testBitSet01a(void);
-static int testBitSet01b(void);
-static int testBitSet01c(void);
-static int testBitSet02(void);
-static int testBitSet03(void);
-static int testBitSet04(void);
-static int testBitSet05(void);
-static int testBitSet06(void);
+static psS32 testBitSet01a(void);
+static psS32 testBitSet01b(void);
+static psS32 testBitSet01c(void);
+static psS32 testBitSet02(void);
+static psS32 testBitSet03(void);
+static psS32 testBitSet04(void);
+static psS32 testBitSet05(void);
+static psS32 testBitSet06(void);
 
 testDescription tests[] = {
@@ -50,5 +50,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -57,5 +57,5 @@
 }
 
-int testBitSet01a(void)
+psS32 testBitSet01a(void)
 {
     psErr* err;
@@ -109,5 +109,5 @@
 }
 
-int testBitSet01b(void)
+psS32 testBitSet01b(void)
 {
     char *binOut = NULL;
@@ -212,5 +212,5 @@
 }
 
-static int testBitSet01c(void)
+static psS32 testBitSet01c(void)
 {
     psBitSet* bs = psBitSetAlloc(24);
@@ -275,5 +275,5 @@
 }
 
-int testBitSet02()
+psS32 testBitSet02()
 {
     char *binOut1 = NULL;
@@ -284,5 +284,5 @@
     psBitSet* bs2 = psBitSetAlloc(24);
     psBitSet* and = psBitSetAlloc(24);
-    for(int i=0; i<24; i++) {
+    for(psS32 i=0; i<24; i++) {
         if ((i & 2) == 0) {
             bs1 = psBitSetSet(bs1, i);
@@ -312,7 +312,7 @@
     }
 
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(and,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(and,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -331,7 +331,7 @@
         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     }
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(and,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(and,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -351,5 +351,5 @@
 }
 
-static int testBitSet03(void)
+static psS32 testBitSet03(void)
 {
     char *binOut1 = NULL;
@@ -360,5 +360,5 @@
     psBitSet* bs2 = psBitSetAlloc(24);
     psBitSet* or = psBitSetAlloc(24);
-    for(int i=0; i<24; i++) {
+    for(psS32 i=0; i<24; i++) {
         if ((i/2) % 2) {
             bs1 = psBitSetSet(bs1, i);
@@ -389,7 +389,7 @@
     }
 
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(or,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(or,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -408,7 +408,7 @@
         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     }
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(or,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(or,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -429,5 +429,5 @@
 }
 
-static int testBitSet04(void)
+static psS32 testBitSet04(void)
 {
     char *binOut1 = NULL;
@@ -438,5 +438,5 @@
     psBitSet* bs2 = psBitSetAlloc(24);
     psBitSet* xor = psBitSetAlloc(24);
-    for(int i=0; i<24; i++) {
+    for(psS32 i=0; i<24; i++) {
         if ((i/2) % 2) {
             bs1 = psBitSetSet(bs1, i);
@@ -467,7 +467,7 @@
     }
 
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(xor,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(xor,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -486,7 +486,7 @@
         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     }
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(xor,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(xor,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -507,5 +507,5 @@
 }
 
-static int testBitSet05(void)
+static psS32 testBitSet05(void)
 {
     char *binOut1 = NULL;
@@ -514,5 +514,5 @@
     psBitSet* bs1 = psBitSetAlloc(24);
     psBitSet* not = psBitSetAlloc(24);
-    for(int i=0; i<24; i++) {
+    for(psS32 i=0; i<24; i++) {
         if (i % 2) {
             bs1 = psBitSetSet(bs1, i);
@@ -538,7 +538,7 @@
     }
 
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(not,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(not,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -556,7 +556,7 @@
         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     }
-    for(int i=0; i<24; i++) {
-        bool truth = psBitSetTest(not,i);
-        bool res = psBitSetTest(outbs,i);
+    for(psS32 i=0; i<24; i++) {
+        psBool truth = psBitSetTest(not,i);
+        psBool res = psBitSetTest(outbs,i);
         if ( res != truth) {
             binOut1 = psBitSetToString(bs1);
@@ -575,5 +575,5 @@
 }
 
-static int testBitSet06(void)
+static psS32 testBitSet06(void)
 {
     psErr* err;