X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fmymemory.h;h=b78eb5427697f887d87c2d034e73227611a3cc6a;hb=88052a38748188dfcf73b49f58ae969f13e34543;hp=1c7f3b3f2f4924daf3fdcd81ea444f4dad14ba55;hpb=87e67ce60ad79d235655d7c74276ba27d1d98632;p=satune.git

diff --git a/src/mymemory.h b/src/mymemory.h
index 1c7f3b3..b78eb54 100644
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -26,26 +26,40 @@
    void * ourrealloc(void *ptr, size_t size);
  */
 
+#if 0
+void *model_malloc(size_t size);
+void model_free(void *ptr);
+void *model_calloc(size_t count, size_t size);
+void *model_realloc(void *ptr, size_t size);
+
+
+#define ourmalloc model_malloc
+#define ourfree model_free
+#define ourrealloc model_realloc
+#define ourcalloc model_calloc
+
+#else
 static inline void *ourmalloc(size_t size) { return malloc(size); }
 static inline void ourfree(void *ptr) { free(ptr); }
 static inline void *ourcalloc(size_t count, size_t size) { return calloc(count, size); }
 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 */