Merge branch 'master' into linprob_table

Conflicts: YASI_12/ds.hashtablebase.h Signed-off-by: saad0105050 <saad0105050@gmail.com>
saq10002 · Sep 16, 2014 · 8d58f38 · 8d58f38
2 parents 5a4c945 + 321f30c
commit 8d58f38
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/YASI_12/common.h b/YASI_12/common.h
@@ -24,6 +24,7 @@ namespace yasi{
 #define MAKE_UNIQUE2(x,y)	MAKE_UNIQUE( CONCAT(x,y) )
 #define MAKE_UNIQUE3(x,y, z)	MAKE_UNIQUE2( CONCAT(x,y), z )
 
+#define FREE_SAFE(x) {if( (x) != 0 ) free(x); (x) = 0; }
 #define DELETE_SAFE(x) {if( (x) != 0 ) delete (x); (x) = 0; }
 #define FREE_SAFE(x) {if( (x) != 0 ) free(x); (x) = 0; }
 #define DELETE_ARR_SAFE(x) {if( (x) != 0 ) delete[] (x); (x) = 0; }