Merge branch 'master' into brian

[satune.git] / src / mymemory.h

diff --git a/src/mymemory.h b/src/mymemory.h
index 5267ce2327e2fd4fc2243f4bf274344b40bc8c36..32dfa51b51e8807f6c906ff64d585f08ba099835 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -19,35 +19,16 @@
 
 #include "config.h"
 
-/** MEMALLOC declares the allocators for a class to allocate
- *     memory in the non-snapshotting heap. */
 /*
-#define MEMALLOC                                                                                \
-       void * operator new(size_t size) { \
-               return model_malloc(size); \
-       } \
-       void operator delete(void *p, size_t size) { \
-               model_free(p);                                   \
-       } \
-       void * operator new[](size_t size) { \
-               return model_malloc(size); \
-       } \
-       void operator delete[](void *p, size_t size) { \
-               model_free(p); \
-       } \
-       void * operator new(size_t size, void *p) {     \
-               return p;                                                                                                                                                               \
-       }
-*/
-
 void * ourmalloc(size_t size);
 void ourfree(void *ptr);
 void * ourcalloc(size_t count, size_t size);
 void * ourrealloc(void *ptr, size_t size);
+*/
 
-void *model_malloc(size_t size);
-void *model_calloc(size_t count, size_t size);
-void * model_realloc(void *ptr, size_t size);
-void model_free(void *ptr);
+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/* _MY_MEMORY_H */