Index: trunk/psLib/src/collections/psBitMask.c
===================================================================
--- trunk/psLib/src/collections/psBitMask.c	(revision 438)
+++ trunk/psLib/src/collections/psBitMask.c	(revision 511)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-17 02:43:59 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-23 21:33:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24,5 +24,5 @@
 
 #include "psBitMask.h"
-//#include "psMemory.h"
+#include "psMemory.h"
 
 /*****************************************************************************/
@@ -35,5 +35,5 @@
     index = bit/8;
     byte = inMask->bits+index;
-    
+
     return byte;
 }
@@ -43,5 +43,5 @@
     char mask = 0x01;
     mask = mask << (bit%8);
-    
+
     return mask;
 }
@@ -52,10 +52,9 @@
 psBitMask* psBitMaskAlloc(int n)
 {
-//    psBitMask *newObj = (psBitMask*)psAlloc(sizeof(psBitMask));
-    psBitMask *newObj = (psBitMask*)malloc(sizeof(psBitMask));
+    psBitMask *newObj = psAlloc(sizeof(psBitMask));
     newObj->n = n;
-    newObj->bits = (char*)malloc(sizeof(char)*n);
+    newObj->bits = psAlloc(sizeof(char)*n);
     memset(newObj->bits, n, 0);
-    
+
     return newObj;
 }
@@ -71,5 +70,5 @@
     char* byte = getByte(bit, inMask);
     *byte |= mask(bit);
-    
+
     return inMask;
 }
@@ -81,9 +80,9 @@
         return 0;
     }
-    
+
     return 1;
 }
 
-psBitMask* psBitMaskOp(psBitMask *outMask, const psBitMask *restrict inMask1, char *operator, 
+psBitMask* psBitMaskOp(psBitMask *outMask, const psBitMask *restrict inMask1, char *operator,
                        const psBitMask *restrict inMask2)
 {
@@ -99,10 +98,10 @@
         return outMask;
     }
-    
+
     if(inMask1 == NULL) {
         printf("Null input psBitMask1\n");
         return outMask;
     }
-    
+
     if(operator == NULL) {
         printf("Null input operator\n");
@@ -110,20 +109,20 @@
 
     }
- 
+
     if(inMask2 == NULL) {
         printf("Null input psBitMask2\n");
         return outMask;
     }
-    
+
     if(inMask1->n != inMask2->n || outMask->n != inMask1->n) {
         printf("Mask sizes not the same\n");
         return outMask;
     }
-    
+
     n = outMask->n;
     outBits = outMask->bits;
     inBits1 = inMask1->bits;
     inBits2 = inMask2->bits;
-    
+
     tempChar = toupper(*operator);
     switch(tempChar) {
@@ -146,5 +145,5 @@
         printf("Invalid psBitMask option %s\n", operator);
     }
-    
+
     return outMask;
 }
@@ -158,5 +157,5 @@
         outString[numBits-i-1] = (psBitMaskTest(inMask, i))?'1':'0';
     }
-    
+
     return outString;
 }