Changeset 2204 for trunk/psLib/test/collections/tst_psBitSet.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/collections/tst_psBitSet.c (modified) (23 diffs)

trunk/psLib/test/collections/tst_psBitSet.c

@@ -17 +17 @@
  *  @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 +27 @@
 #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 +50 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -57 +57 @@
 }
 
-int testBitSet01a(void)
+psS32 testBitSet01a(void)
 {
     psErr* err;
@@ -109 +109 @@
 }
 
-int testBitSet01b(void)
+psS32 testBitSet01b(void)
 {
     char *binOut = NULL;
@@ -212 +212 @@
 }
 
-static int testBitSet01c(void)
+static psS32 testBitSet01c(void)
 {
     psBitSet* bs = psBitSetAlloc(24);
@@ -275 +275 @@
 }
 
-int testBitSet02()
+psS32 testBitSet02()
 {
     char *binOut1 = NULL;
@@ -284 +284 @@
     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 +312 @@
     }
 
-    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 +331 @@
         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 +351 @@
 }
 
-static int testBitSet03(void)
+static psS32 testBitSet03(void)
 {
     char *binOut1 = NULL;
@@ -360 +360 @@
     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 +389 @@
     }
 
-    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 +408 @@
         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 +429 @@
 }
 
-static int testBitSet04(void)
+static psS32 testBitSet04(void)
 {
     char *binOut1 = NULL;
@@ -438 +438 @@
     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 +467 @@
     }
 
-    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 +486 @@
         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 +507 @@
 }
 
-static int testBitSet05(void)
+static psS32 testBitSet05(void)
 {
     char *binOut1 = NULL;
@@ -514 +514 @@
     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 +538 @@
     }
 
-    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 +556 @@
         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 +575 @@
 }
 
-static int testBitSet06(void)
+static psS32 testBitSet06(void)
 {
     psErr* err;