X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fmymemory.h;h=92fb0fed609057c3fd40132bcf507986489133cd;hp=1c7f3b3f2f4924daf3fdcd81ea444f4dad14ba55;hb=77f32c79afdf12f29c040d511cd84f15d703ceb9;hpb=c5e632659f6f8ad931cf14104f72a5aa59acf911 diff --git a/src/mymemory.h b/src/mymemory.h index 1c7f3b3..92fb0fe 100644 --- a/src/mymemory.h +++ b/src/mymemory.h @@ -26,10 +26,24 @@ void * ourrealloc(void *ptr, size_t size); */ +#if 1 +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) { \