Index: trunk/psLib/test/collections/tst_psArray.c
===================================================================
--- trunk/psLib/test/collections/tst_psArray.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psArray.c	(revision 2204)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-09-28 23:26:49 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26,5 +26,5 @@
 typedef struct
 {
-    int x;
+    psS32 x;
     float y;
 }
@@ -32,6 +32,6 @@
 
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
     // Create array of pointers
@@ -51,5 +51,5 @@
     // Test B - Add data to void pointer array
     printPositiveTestHeader(stdout, "psArray", "Add data to void pointer array");
-    for(int i = 0; i < 5; i++) {
+    for(psS32 i = 0; i < 5; i++) {
         testStruct *ts = psAlloc(sizeof(testStruct));
         ts->x = 10*i;
@@ -60,5 +60,5 @@
     }
 
-    for(int i = 0; i < 5; i++) {
+    for(psS32 i = 0; i < 5; i++) {
         testStruct *ts = (testStruct*)psArr->data[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
@@ -85,5 +85,5 @@
     psArr = psArrayRealloc(psArr,10);
     printf("Adding more elements to void pointer array...\n");
-    for(int i = 5; i < 10; i++) {
+    for(psS32 i = 5; i < 10; i++) {
         testStruct *ts = psAlloc(sizeof(testStruct));
         ts->x = 10*i;
@@ -94,5 +94,5 @@
         psMemIncrRefCounter(ts);
     }
-    for(int i = 0; i < 10; i++) {
+    for(psS32 i = 0; i < 10; i++) {
         testStruct *ts = (testStruct*)psArr->data[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
@@ -118,5 +118,5 @@
     printPositiveTestHeader(stdout,"psArray","Reallocate void pointer array smaller");
     psArr = psArrayRealloc(psArr,3);
-    for(int i = 0; i < 3; i++) {
+    for(psS32 i = 0; i < 3; i++) {
         testStruct *ts = (testStruct*)psArr->data[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
@@ -142,9 +142,9 @@
     printPositiveTestHeader(stdout, "psArray", "Free void pointer array");
     psFree(psArr);
-    for(int i = 0; i < 10; i++) {
+    for(psS32 i = 0; i < 10; i++) {
         psFree(mySt[i]);
     }
     psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psBitSet.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet.c	(revision 2153)
+++ 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;
Index: trunk/psLib/test/collections/tst_psHash00.c
===================================================================
--- trunk/psLib/test/collections/tst_psHash00.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psHash00.c	(revision 2204)
@@ -8,11 +8,11 @@
 #include "psHash.h"
 #define NUM_HASH_TABLE_BUCKETS 10
-int main()
+psS32 main()
 {
     psHash *myHashTable = NULL;
-    int testStatus      = true;
-    int i               = 0;
-    int currentId = psMemGetId();
-    int memLeaks        = 0;
+    psS32 testStatus      = true;
+    psS32 i               = 0;
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks        = 0;
     printPositiveTestHeader(stdout,
                             "psHash functions",
Index: trunk/psLib/test/collections/tst_psHash01.c
===================================================================
--- trunk/psLib/test/collections/tst_psHash01.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psHash01.c	(revision 2204)
@@ -7,5 +7,5 @@
 #include "psHash.h"
 #define NUM_HASH_TABLE_BUCKETS 100
-int imGlobal = 0;
+psS32 imGlobal = 0;
 
 typedef struct
@@ -32,11 +32,11 @@
 }
 
-int main()
+psS32 main()
 {
     psHash *myHashTable = NULL;
-    int testStatus      = true;
-    int currentId = psMemGetId();
+    psS32 testStatus      = true;
+    psS32 currentId = psMemGetId();
     ID* id = NULL;
-    int memLeaks        = 0;
+    psS32 memLeaks        = 0;
 
     printPositiveTestHeader(stdout,
Index: trunk/psLib/test/collections/tst_psHash02.c
===================================================================
--- trunk/psLib/test/collections/tst_psHash02.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psHash02.c	(revision 2204)
@@ -12,5 +12,5 @@
 #include "psHash.h"
 #define NUM_HASH_TABLE_BUCKETS 100
-int imGlobal = 0;
+psS32 imGlobal = 0;
 
 typedef struct
@@ -36,9 +36,9 @@
 }
 
-int main()
+psS32 main()
 {
     psHash *myHashTable = NULL;
-    int testStatus      = true;
-    int i               = 0;
+    psS32 testStatus      = true;
+    psS32 i               = 0;
     ID *id = NULL;
     char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL
@@ -46,6 +46,6 @@
     char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL
                      };
-    int currentId = psMemGetId();
-    int memLeaks        = 0;
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks        = 0;
 
     printPositiveTestHeader(stdout,
Index: trunk/psLib/test/collections/tst_psHash03.c
===================================================================
--- trunk/psLib/test/collections/tst_psHash03.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psHash03.c	(revision 2204)
@@ -11,6 +11,6 @@
 #include "psMemory.h"
 #define NUM_HASH_TABLE_BUCKETS 100
-int imGlobal = 0;
-int currentId = 0;
+psS32 imGlobal = 0;
+psS32 currentId = 0;
 
 typedef struct
@@ -27,5 +27,5 @@
     psMemBlock **memBlocks = NULL;
     psMemBlock *tmp = NULL;
-    int numBlocks = 0;
+    psS32 numBlocks = 0;
 
     numBlocks = psMemCheckLeaks(currentId, &memBlocks, NULL);
@@ -36,5 +36,5 @@
     if (memBlocks != NULL) {
         for (tmp = *memBlocks; tmp != NULL; tmp = tmp->nextBlock) {
-            printf("%d ", (int) tmp->id);
+            printf("%d ", (psS32) tmp->id);
         }
     }
@@ -62,11 +62,11 @@
 }
 
-int main()
+psS32 main()
 {
     psHash *myHashTable = NULL;
-    int testStatus      = true;
-    int i               = 0;
-    int TotalKeys       = 0;
-    bool retVal         = false;
+    psS32 testStatus      = true;
+    psS32 i               = 0;
+    psS32 TotalKeys       = 0;
+    psBool retVal         = false;
     ID *id = NULL;
     ID *ids[4];
@@ -75,5 +75,5 @@
     char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL
                      };
-    int memLeaks        = 0;
+    psS32 memLeaks        = 0;
 
     currentId = psMemGetId();
Index: trunk/psLib/test/collections/tst_psHash04.c
===================================================================
--- trunk/psLib/test/collections/tst_psHash04.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psHash04.c	(revision 2204)
@@ -7,5 +7,5 @@
 #include "psHash.h"
 #define NUM_HASH_TABLE_BUCKETS 100
-int imGlobal = 0;
+psS32 imGlobal = 0;
 
 typedef struct
@@ -32,15 +32,15 @@
 }
 
-int main()
+psS32 main()
 {
     psHash *myHashTable = NULL;
-    int testStatus      = true;
-    int i               = 0;
+    psS32 testStatus      = true;
+    psS32 i               = 0;
     char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL
                      };
     char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL
                      };
-    int currentId = psMemGetId();
-    int memLeaks        = 0;
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks        = 0;
     psList *myLinkList = NULL;
     psListElem *tmp = NULL;
Index: trunk/psLib/test/collections/tst_psList.c
===================================================================
--- trunk/psLib/test/collections/tst_psList.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psList.c	(revision 2204)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 02:24:59 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18,12 +18,12 @@
 
 
-static int testListAlloc(void);
-static int testListAdd(void);
-static int testListGet(void);
-static int testListRemove(void);
-static int testListConvert(void);
-static int testListIterator(void);
-static int testListFree(void);
-static int testListSort(void);
+static psS32 testListAlloc(void);
+static psS32 testListAdd(void);
+static psS32 testListGet(void);
+static psS32 testListRemove(void);
+static psS32 testListConvert(void);
+static psS32 testListIterator(void);
+static psS32 testListFree(void);
+static psS32 testListSort(void);
 
 testDescription tests[] = {
@@ -39,5 +39,5 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -50,8 +50,8 @@
 }
 
-int testListAlloc(void)
+psS32 testListAlloc(void)
 {
     psList* list;
-    int ref;
+    psS32 ref;
     float* data;
 
@@ -117,8 +117,8 @@
 }
 
-int testListAdd(void)
+psS32 testListAdd(void)
 {
     psList* list = NULL;
-    int* data = NULL;
+    psS32* data = NULL;
 
     psLogMsg(__func__,PS_LOG_INFO,"psListAdd shall add an element to list");
@@ -134,5 +134,5 @@
     */
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 1;
 
@@ -161,5 +161,5 @@
 
     //  3. where is PS_LIST_HEAD or PS_LIST_TAIL
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 2;
     if ( ! psListAdd(list,PS_LIST_HEAD,data) ) {
@@ -181,10 +181,10 @@
 
     // verify that the head is the inserted data item
-    if (*(int*)list->head->data != 2) {
+    if (*(psS32*)list->head->data != 2) {
         psError(__func__,"psListAdd with PS_LIST_HEAD didn't insert at the head.");
         return 5;
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 3;
     if ( ! psListAdd(list,PS_LIST_TAIL,data) ) {
@@ -205,5 +205,5 @@
 
     // verify that the head is still the same
-    if (*(int*)list->head->data != 2) {
+    if (*(psS32*)list->head->data != 2) {
         psError(__func__,"psListAdd with PS_LIST_TAIL modified the head.");
         return 7;
@@ -211,5 +211,5 @@
 
     // verify that the tail is the data item inserted
-    if (*(int*)list->tail->data != 3) {
+    if (*(psS32*)list->tail->data != 3) {
         psError(__func__,"psListAdd with PS_LIST_TAIL didn't insert at the tail.");
         return 8;
@@ -218,5 +218,5 @@
     // 4. where is not PS_LIST_* but <0
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 4;
     psLogMsg(__func__,PS_LOG_INFO,"Following should error with invalid insert location");
@@ -239,5 +239,5 @@
 
     // 5. where is >0
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 5;
 
@@ -253,5 +253,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 4 || *(int*)list->head->next->data != 5) {
+    if (list->size != 4 || *(psS32*)list->head->next->data != 5) {
         printListInt(list);
         psError(__func__,"psListAdd didn't insert to position #1.");
@@ -259,5 +259,5 @@
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 6;
     if ( ! psListAdd(list,3,data) ) {
@@ -271,5 +271,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 5  || *(int *)list->head->next->next->next->data != 6) {
+    if (list->size != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
         printListInt(list);
         psError(__func__,"psListAdd didn't insert to position #4.");
@@ -277,5 +277,5 @@
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 7;
     if ( ! psListAdd(list,2,data) ) {
@@ -289,5 +289,5 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 6  || *(int *)list->head->next->next->data != 7) {
+    if (list->size != 6  || *(psS32 *)list->head->next->next->data != 7) {
         printListInt(list);
         psError(__func__,"psListAdd didn't insert to position #2.");
@@ -295,5 +295,5 @@
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 7;
     psLogMsg(__func__,PS_LOG_INFO,"Following should be a warning.");
@@ -325,6 +325,6 @@
 void printListInt(psList* list)
 {
-    int* data = NULL;
-    bool first = true;
+    psS32* data = NULL;
+    psBool first = true;
 
     psListSetIterator(list,PS_LIST_HEAD);
@@ -333,7 +333,7 @@
     while ( data != NULL ) {
         if (!first) {
-            printf(", %d",*(int*)data);
+            printf(", %d",*(psS32*)data);
         } else {
-            printf("%d",*(int*)data);
+            printf("%d",*(psS32*)data);
             first = false;
         }
@@ -345,8 +345,8 @@
 
 
-int testListGet(void)
+psS32 testListGet(void)
 {
     psList* list = NULL;
-    int* data;
+    psS32* data;
 
     /*
@@ -371,20 +371,20 @@
 
     // create a list
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 0;
     list = psListAlloc(data);
     psFree(data);
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 1;
     psListAdd(list,PS_LIST_TAIL,data);
     psFree(data);
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 2;
     psListAdd(list,PS_LIST_TAIL,data);
     psFree(data);
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 3;
     psListAdd(list,PS_LIST_TAIL,data);
@@ -392,10 +392,10 @@
 
     //  2. which>0 and which<list.n.
-    data = (int*)psListGet(list,3);
+    data = (psS32*)psListGet(list,3);
     if (data == NULL || *data != 3) {
         psError(__func__,"psListGet failed with which=3");
         return 2;
     }
-    data = (int*)psListGet(list,1);
+    data = (psS32*)psListGet(list,1);
     if (data == NULL || *data != 1) {
         psError(__func__,"psListGet failed with which=1");
@@ -404,10 +404,10 @@
 
     //  3. which>=list.n.
-    data = (int*)psListGet(list,5);
+    data = (psS32*)psListGet(list,5);
     if (data != NULL) {
         psError(__func__,"psListGet failed with which=5");
         return 4;
     }
-    data = (int*)psListGet(list,4);
+    data = (psS32*)psListGet(list,4);
     if (data != NULL) {
         psError(__func__,"psListGet failed with which=4");
@@ -416,5 +416,5 @@
 
     //  4. which=PS_LIST_HEAD
-    data = (int*)psListGet(list,PS_LIST_HEAD);
+    data = (psS32*)psListGet(list,PS_LIST_HEAD);
     if (data == NULL || *data != 0) {
         psError(__func__,"psListGet failed with which=PS_LIST_HEAD");
@@ -423,5 +423,5 @@
 
     //  5. which=PS_LIST_NEXT
-    data = (int*)psListGet(list,PS_LIST_NEXT);
+    data = (psS32*)psListGet(list,PS_LIST_NEXT);
     if (data == NULL || *data != 1) {
         psError(__func__,"psListGet failed with which=PS_LIST_NEXT");
@@ -430,5 +430,5 @@
 
     //  6. which=PS_LIST_TAIL
-    data = (int*)psListGet(list,PS_LIST_TAIL);
+    data = (psS32*)psListGet(list,PS_LIST_TAIL);
     if (data == NULL || *data != 3) {
         psError(__func__,"psListGet failed with which=PS_LIST_TAIL");
@@ -437,5 +437,5 @@
 
     //  7. which=PS_LIST_PREV
-    data = (int*)psListGet(list,PS_LIST_PREVIOUS);
+    data = (psS32*)psListGet(list,PS_LIST_PREVIOUS);
     if (data == NULL || *data != 2) {
         psError(__func__,"psListGet failed with which=PS_LIST_PREV");
@@ -448,8 +448,8 @@
 }
 
-int testListRemove(void)
+psS32 testListRemove(void)
 {
     psList* list = NULL;
-    int* data;
+    psS32* data;
 
     /*
@@ -480,6 +480,6 @@
     list = psListAlloc(NULL);
 
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         psListAdd(list,PS_LIST_TAIL,data);
@@ -682,14 +682,14 @@
 }
 
-int testListConvert(void)
+psS32 testListConvert(void)
 {
 
     psList* list = NULL;
     psArray* arr = NULL;
-    int* data;
+    psS32* data;
 
     /*
         array=psListToArray(list) shall take each element of the list, increment
-        their reference, and insert them into the returned fresh void* array.
+        their reference, and insert them into the returned fresh psPtr array.
         The list shall not be changed, except for the element reference increment.
     */
@@ -699,6 +699,6 @@
     // create a list
     list = psListAlloc(NULL);
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         psListAdd(list,PS_LIST_TAIL,data);
@@ -712,13 +712,13 @@
         return 1;
     }
-    for (int i=0;i<arr->n;i++) {
-        if (i != *(int*)arr->data[i]) {
+    for (psS32 i=0;i<arr->n;i++) {
+        if (i != *(psS32*)arr->data[i]) {
             psError(__func__,"Element %d of array is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
-        if (i != *(int*)psListGet(list,i)) {
+        if (i != *(psS32*)psListGet(list,i)) {
             psError(__func__,"Element %d of list is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
@@ -738,6 +738,6 @@
     arr = psArrayAlloc(15);
     arr->n = arr->nalloc;
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         arr->data[lcv] = data;
@@ -750,13 +750,13 @@
         return 1;
     }
-    for (int i=0;i<arr->n;i++) {
-        if (i != *(int*)arr->data[i]) {
+    for (psS32 i=0;i<arr->n;i++) {
+        if (i != *(psS32*)arr->data[i]) {
             psError(__func__,"Element %d of array is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
-        if (i != *(int*)psListGet(list,i)) {
+        if (i != *(psS32*)psListGet(list,i)) {
             psError(__func__,"Element %d of list is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
@@ -810,8 +810,8 @@
 }
 
-int testListIterator(void)
+psS32 testListIterator(void)
 {
     psList* list = NULL;
-    int* data;
+    psS32* data;
 
     psLogMsg(__func__,PS_LOG_INFO," psListSetIterator/psListGetNext/psListGetPrev"
@@ -837,6 +837,6 @@
     // create a list
     list = psListAlloc(NULL);
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         psListAdd(list,PS_LIST_TAIL,data);
@@ -852,5 +852,5 @@
     // 3. set list.cursor to list.tail if where=PS_LIST_TAIL
     psListSetIterator(list,PS_LIST_TAIL);
-    if (*(int*)psListGetCurrent(list) != 14) {
+    if (*(psS32*)psListGetCurrent(list) != 14) {
         psError(__func__,"Didn't successfully move cursor to tail.");
         return 1;
@@ -859,5 +859,5 @@
     // 2. set list.cursor to list.head if where=PS_LIST_HEAD
     psListSetIterator(list,PS_LIST_HEAD);
-    if (*(int*)psListGetCurrent(list) != 0) {
+    if (*(psS32*)psListGetCurrent(list) != 0) {
         psError(__func__,"Didn't successfully move cursor to head.");
         return 2;
@@ -866,10 +866,10 @@
     // 4. set list.cursor to list.cursor->next if where=PS_LIST_NEXT
     psListSetIterator(list,PS_LIST_NEXT);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"Didn't successfully move cursor to next.");
         return 3;
     }
     psListSetIterator(list,PS_LIST_NEXT);
-    if (*(int*)psListGetCurrent(list) != 2) {
+    if (*(psS32*)psListGetCurrent(list) != 2) {
         psError(__func__,"Didn't successfully move cursor to next twice.");
         return 4;
@@ -878,10 +878,10 @@
     // 5. set list.cursor to list.cursor->prev if where=PS_LIST_PREV
     psListSetIterator(list,PS_LIST_PREVIOUS);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"Didn't successfully move cursor to previous.");
         return 5;
     }
     psListSetIterator(list,PS_LIST_PREVIOUS);
-    if (*(int*)psListGetCurrent(list) != 0) {
+    if (*(psS32*)psListGetCurrent(list) != 0) {
         psError(__func__,"Didn't successfully move cursor to previous twice.");
         return 6;
@@ -892,10 +892,10 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should error with 'Can't move to an unknown position.'");
     psListSetIterator(list,PS_LIST_UNKNOWN);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"PS_LIST_UNKNOWN moved cursor.");
         return 7;
     }
     psListSetIterator(list,PS_LIST_CURRENT);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"PS_LIST_CURRENT moved cursor.");
         return 8;
@@ -903,21 +903,21 @@
 
     // test psListGetPrevious/Next
-    if (*(int*)psListGetNext(list) != 2) {
+    if (*(psS32*)psListGetNext(list) != 2) {
         psError(__func__,"psListGetNext didn't move cursor to next.");
         return 9;
     }
-    if (*(int*)psListGetNext(list) != 3) {
+    if (*(psS32*)psListGetNext(list) != 3) {
         psError(__func__,"psListGetNext didn't move cursor to next.");
         return 10;
     }
-    if (*(int*)psListGetPrevious(list) != 2) {
+    if (*(psS32*)psListGetPrevious(list) != 2) {
         psError(__func__,"psListGetPrevious didn't move cursor to previous.");
         return 11;
     }
-    if (*(int*)psListGetPrevious(list) != 1) {
+    if (*(psS32*)psListGetPrevious(list) != 1) {
         psError(__func__,"psListGetPrevious didn't move cursor to previous.");
         return 12;
     }
-    if (*(int*)psListGetPrevious(list) != 0) {
+    if (*(psS32*)psListGetPrevious(list) != 0) {
         psError(__func__,"psListGetPrevious didn't move cursor to previous..");
         return 13;
@@ -939,5 +939,5 @@
 }
 
-int testListFree(void)
+psS32 testListFree(void)
 {
     float* data[15];
@@ -954,6 +954,6 @@
 
     list = psListAlloc(NULL);
-    for (int lcv=0;lcv<15;lcv++) {
-        data[lcv] = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data[lcv] = psAlloc(sizeof(psS32));
         *data[lcv] = lcv;
         psListAdd(list,PS_LIST_TAIL,data[lcv]);
@@ -987,5 +987,5 @@
     */
 
-    for (int i=0;i<15;i++) {
+    for (psS32 i=0;i<15;i++) {
         if (psMemGetRefCounter(data[i]) != 1) {
             psError(__func__,"pslistFree didn't decrement the data item's reference counter");
@@ -998,5 +998,5 @@
 }
 
-int testListSort(void)
+psS32 testListSort(void)
 {
     psList* list;
@@ -1004,6 +1004,6 @@
     list = psListAlloc(NULL);
 
-    for (int lcv=0;lcv<15;lcv++) {
-        float* data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        float* data = psAlloc(sizeof(psS32));
         if (lcv < 7) {
             *data = 13-lcv*2;
@@ -1070,6 +1070,6 @@
     list = psListAlloc(NULL);
 
-    for (int lcv=0;lcv<15;lcv++) {
-        psU32* data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        psU32* data = psAlloc(sizeof(psS32));
         if (lcv < 7) {
             *data = 13-lcv*2;
Index: trunk/psLib/test/collections/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 2204)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-06 22:51:31 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80,5 +80,5 @@
         vec = (psVector*)metadataItem->data.V;
         printf("Key Value: ");
-        for(int i=0; i<vec->nalloc;i++) {
+        for(psS32 i=0; i<vec->nalloc;i++) {
             printf("%d ", vec->data.S32[i]);
         }
@@ -103,5 +103,5 @@
 static void printMetadataTable(psHash *mdTable)
 {
-    int i;
+    psS32 i;
     psHashBucket* ptr = NULL;
     for(i=0; i<mdTable->nbucket; i++) {
@@ -123,10 +123,10 @@
 
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     // Test A - Read config file with overwrite set true
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read config file with overwrite set true");
     psMetadata *metadata1 = NULL;
-    int failedLines1 = 0;
+    psS32 failedLines1 = 0;
     failedLines1 = psMetadataParseConfig(&metadata1, "test.config", true);
     printf("Failed lines: %d Expected: 6\n", failedLines1);
@@ -138,5 +138,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false");
     psMetadata *metadata2 = NULL;
-    int failedLines2 = 0;
+    psS32 failedLines2 = 0;
     failedLines2 = psMetadataParseConfig(&metadata2, "test.config", false);
     printf("Failed lines: %d Expected: 7", failedLines2);
@@ -148,5 +148,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata");
     psMetadata *metadata3 = psMetadataAlloc();
-    int failedLines3 = 0;
+    psS32 failedLines3 = 0;
     failedLines3 = psMetadataParseConfig(&metadata3, "test.config", false);
     printf("Failed lines: %d Expected: 7", failedLines3);
@@ -176,5 +176,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 2204)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-15 19:26:31 $
+*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -96,5 +96,5 @@
 static void printMetadataTable(psHash *mdTable)
 {
-    int i;
+    psS32 i;
     psHashBucket* ptr = NULL;
     for(i=0; i<mdTable->nbucket; i++) {
@@ -116,5 +116,5 @@
 
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psMetadata *metadata1 = NULL;
@@ -262,5 +262,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 2204)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-07 22:31:31 $
+*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60,5 +60,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1 = NULL;
@@ -136,5 +136,5 @@
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 2204)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-08 01:33:14 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60,5 +60,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1 = NULL;
@@ -231,5 +231,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 2204)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-08 20:53:21 $
+*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -64,5 +64,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1 = NULL;
@@ -201,5 +201,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 2204)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-12 01:40:32 $
+*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68,7 +68,7 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
-    long data;
+    psS64 data;
     psF32 fpdata;
     psMetadataItem *item1 = NULL;
@@ -271,5 +271,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 2204)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-12 01:54:00 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -59,5 +59,5 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psMetadataItem *item1a = NULL;
@@ -134,5 +134,5 @@
     }
     psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psVector.c
===================================================================
--- trunk/psLib/test/collections/tst_psVector.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psVector.c	(revision 2204)
@@ -14,6 +14,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-09-28 23:26:49 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24,6 +24,6 @@
 #include "psTest.h"
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
 
@@ -40,5 +40,5 @@
     // Test B - Add data to integer vector
     printPositiveTestHeader(stdout, "psVector", "Add data to S32 vector");
-    for(int i = 0; i < 5; i++) {
+    for(psS32 i = 0; i < 5; i++) {
         psVec->data.S32[i] = i*10;
         printf("Elem %d = %d\n", i, psVec->data.S32[i]);
@@ -53,5 +53,5 @@
     psVec = psVectorRealloc(psVec,10);
     printf("Adding more elements to S32 vector...\n");
-    for(int i = 5; i < 10; i++) {
+    for(psS32 i = 5; i < 10; i++) {
         psVec->data.S32[i] = i*10;
         psVec->n++;
@@ -67,5 +67,5 @@
     psVec = psVectorRealloc(psVec,3);
     printf("Vector size = %d\n", psVec->nalloc);
-    for(int i = 0; i < 3; i++) {
+    for(psS32 i = 0; i < 3; i++) {
         printf("Elem %d = %d\n", i, psVec->data.S32[i]);
     }
@@ -78,9 +78,9 @@
     printPositiveTestHeader(stdout, "psVector", "Free S32 vector");
     psFree(psVec);
-    int leaks = psMemCheckLeaks(0, NULL, stdout);
+    psS32 leaks = psMemCheckLeaks(0, NULL, stdout);
     if(leaks != 0) {
         printf("ERROR: Found %d memory leaks\n",leaks);
     }
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psVectorSort_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psVectorSort_01.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psVectorSort_01.c	(revision 2204)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,6 +20,6 @@
 #include "psTest.h"
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
     psVector *in = NULL;
@@ -41,5 +41,5 @@
     in->data.F32[5] = 5.0f;
     in->data.F32[6] = -20.0f;
-    for(int i=0; i<7; i++) {
+    for(psS32 i=0; i<7; i++) {
         printf("vec[%d] = %f\n", i, in->data.F32[i]);
     }
@@ -51,5 +51,5 @@
     tempVec = out;
     out = psVectorSort(out, in);
-    for(int i=0; i<7; i++) {
+    for(psS32 i=0; i<7; i++) {
         printf("vec[%d] = %f\n", i, out->data.F32[i]);
     }
@@ -63,5 +63,5 @@
     printPositiveTestHeader(stdout,"psVectorSort", "Sort input float vector into itself");
     in = psVectorSort(in, in);
-    for(int i=0; i<7; i++) {
+    for(psS32 i=0; i<7; i++) {
         printf("vec[%d] = %f\n", i, out->data.F32[i]);
     }
@@ -74,5 +74,5 @@
     psFree(out);
     psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psVectorSort_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psVectorSort_02.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psVectorSort_02.c	(revision 2204)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,6 +20,6 @@
 #include "psTest.h"
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
     psVector *in = NULL;
@@ -36,5 +36,5 @@
     in->data.F32[3] = 1.0f;
     in->data.F32[4] = 5.0f;
-    for(int i=0; i<5; i++) {
+    for(psS32 i=0; i<5; i++) {
         printf("arr[%d] = %f\n", i, in->data.F32[i]);
     }
@@ -45,5 +45,5 @@
     printPositiveTestHeader(stdout,"psVectorSortIndex", "Create sorted index vector");
     out = psVectorSortIndex(out, in);
-    for(int i=0; i<5; i++) {
+    for(psS32 i=0; i<5; i++) {
         printf("arr[%d] = %d\n", i, out->data.U32[i]);
     }
@@ -61,9 +61,9 @@
     psFree(in);
     psFree(out);
-    int nLeaks = psMemCheckLeaks(0, NULL, stdout);
+    psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout);
     if(nLeaks) {
         printf("ERROR: Found %d memory leaks\n", nLeaks);
     }
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psVectorSort_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psVectorSort_03.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psVectorSort_03.c	(revision 2204)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,6 +22,6 @@
 #include "psTest.h"
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
     psVector *in = NULL;
@@ -37,5 +37,5 @@
     out->n = 6;
     in->n = 5;
-    for(int i=0; i<5; i++) {
+    for(psS32 i=0; i<5; i++) {
         printf("arr[%d] = %f\n", i, in->data.F32[i]);
     }
@@ -55,5 +55,5 @@
     out2 = psVectorAlloc(5, PS_TYPE_F64);
     out2->n = 5;
-    for(int j=0; j<5; j++) {
+    for(psS32 j=0; j<5; j++) {
         printf("vec[%d] = %f\n", j, in2->data.F32[j]);
     }
@@ -72,9 +72,9 @@
     psFree(out);
     psFree(out2);
-    int nLeaks = psMemCheckLeaks(0, NULL, stdout);
+    psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout);
     if(nLeaks) {
         printf("ERROR: Found %d memory leaks\n", nLeaks);
     }
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);
Index: trunk/psLib/test/collections/tst_psVectorSort_04.c
===================================================================
--- trunk/psLib/test/collections/tst_psVectorSort_04.c	(revision 2153)
+++ trunk/psLib/test/collections/tst_psVectorSort_04.c	(revision 2204)
@@ -9,6 +9,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,6 +19,6 @@
 #include "psTest.h"
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
     psVector *badIn = NULL;
@@ -34,9 +34,9 @@
     printPositiveTestHeader(stdout, "psVectorSort", "Free vectors");
     psFree(goodOut);
-    int nLeaks = psMemCheckLeaks(0, NULL, stdout);
+    psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout);
     if(nLeaks) {
         printf("ERROR: Found %d memory blocks\n", nLeaks);
     }
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);