Version abc90215

1 files changed, 7 insertions, 9 deletions

diff --git a/src/sat/bsat/satVec.h b/src/sat/bsat/satVec.h
index d7fce5c0..f017c90b 100644
--- a/src/sat/bsat/satVec.h
+++ b/src/sat/bsat/satVec.h
@@ -2,7 +2,7 @@
 MiniSat -- Copyright (c) 2005, Niklas Sorensson
 http://www.cs.chalmers.se/Cs/Research/FormalMethods/MiniSat/
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+Permission is hereby granted, ABC_FREE of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction,
 including without limitation the rights to use, copy, modify, merge, publish, distribute,
 sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
@@ -22,8 +22,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef satVec_h
 #define satVec_h
 
-#include <stdlib.h>
-
 // vector of 32-bit intergers (added for 64-bit portability)
 struct veci_t {
     int    size;
@@ -35,10 +33,10 @@ typedef struct veci_t veci;
 static inline void veci_new (veci* v) {
     v->size = 0;
     v->cap  = 4;
-    v->ptr  = (int*)malloc(sizeof(int)*v->cap);
+    v->ptr  = (int*)ABC_ALLOC( char, sizeof(int)*v->cap);
 }
 
-static inline void   veci_delete (veci* v)          { free(v->ptr);   }
+static inline void   veci_delete (veci* v)          { ABC_FREE(v->ptr);   }
 static inline int*   veci_begin  (veci* v)          { return v->ptr;  }
 static inline int    veci_size   (veci* v)          { return v->size; }
 static inline void   veci_resize (veci* v, int k)   { v->size = k;    } // only safe to shrink !!
@@ -46,7 +44,7 @@ static inline void   veci_push   (veci* v, int e)
 {
     if (v->size == v->cap) {
         int newsize = v->cap * 2;//+1;
-        v->ptr = (int*)realloc(v->ptr,sizeof(int)*newsize);
+        v->ptr = ABC_REALLOC( int, v->ptr, newsize );
         v->cap = newsize; }
     v->ptr[v->size++] = e;
 }
@@ -63,10 +61,10 @@ typedef struct vecp_t vecp;
 static inline void vecp_new (vecp* v) {
     v->size = 0;
     v->cap  = 4;
-    v->ptr  = (void**)malloc(sizeof(void*)*v->cap);
+    v->ptr  = (void**)ABC_ALLOC( char, sizeof(void*)*v->cap);
 }
 
-static inline void   vecp_delete (vecp* v)          { free(v->ptr);   }
+static inline void   vecp_delete (vecp* v)          { ABC_FREE(v->ptr);   }
 static inline void** vecp_begin  (vecp* v)          { return v->ptr;  }
 static inline int    vecp_size   (vecp* v)          { return v->size; }
 static inline void   vecp_resize (vecp* v, int   k) { v->size = k;    } // only safe to shrink !!
@@ -74,7 +72,7 @@ static inline void   vecp_push   (vecp* v, void* e)
 {
     if (v->size == v->cap) {
         int newsize = v->cap * 2;//+1;
-        v->ptr = (void**)realloc(v->ptr,sizeof(void*)*newsize);
+        v->ptr = ABC_REALLOC( void*, v->ptr, newsize );
         v->cap = newsize; }
     v->ptr[v->size++] = e;
 }