X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fmymemory.h;h=b78eb5427697f887d87c2d034e73227611a3cc6a;hp=0798860fa89a625aad4bfbee1c9cfffd88fd70bc;hb=d106cc1899b1f3d82cc35a60d77b2c87f8355fdd;hpb=ee7d71e66d8d472895d9f742a40ea9bb477a8f32

diff --git a/src/mymemory.h b/src/mymemory.h
index 0798860..b78eb54 100644
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-//#define SATCHECK_CONFIG
-
 /*
    void * ourmalloc(size_t size);
    void ourfree(void *ptr);
@@ -28,7 +26,7 @@
    void * ourrealloc(void *ptr, size_t size);
  */
 
-#ifdef SATCHECK_CONFIG
+#if 0
 void *model_malloc(size_t size);
 void model_free(void *ptr);
 void *model_calloc(size_t count, size_t size);
@@ -47,21 +45,21 @@ static inline void *ourcalloc(size_t count, size_t size) { return calloc(count,
 static inline void *ourrealloc(void *ptr, size_t size) { return realloc(ptr, size); }
 #endif
 
-#define CMEMALLOC                           \
-	void *operator new(size_t size) {       \
-		return ourmalloc(size);                \
-	}                                                  \
-	void operator delete(void *p, size_t size) {       \
-		ourfree(p);                                      \
-	}                                                  \
-	void *operator new[](size_t size) {               \
-		return ourmalloc(size);                          \
-	}                                                    \
-	void operator delete[](void *p, size_t size) {       \
-		ourfree(p);                                        \
-	}                                                                     \
-	void *operator new(size_t size, void *p) {															/* placement new */ \
-		return p;                                                           \
+#define CMEMALLOC														\
+	void *operator new(size_t size) {				\
+		return ourmalloc(size);								 \
+	}																									 \
+	void operator delete(void *p, size_t size) {			 \
+		ourfree(p);																			 \
+	}																									 \
+	void *operator new[](size_t size) {								\
+		return ourmalloc(size);													 \
+	}																										 \
+	void operator delete[](void *p, size_t size) {			 \
+		ourfree(p);																				 \
+	}																																			\
+	void *operator new(size_t size, void *p) {															/* placement new */	\
+		return p;																														\
 	}
 
 #endif/* _MY_MEMORY_H */