X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fmymemory.h;h=b78eb5427697f887d87c2d034e73227611a3cc6a;hp=7c63aa11c10edb99f259ab9a11fffcae8df89794;hb=d106cc1899b1f3d82cc35a60d77b2c87f8355fdd;hpb=0703630a40f4fcfd8c8dcad336472907f125c86c diff --git a/src/mymemory.h b/src/mymemory.h index 7c63aa1..b78eb54 100644 --- a/src/mymemory.h +++ b/src/mymemory.h @@ -24,13 +24,13 @@ void ourfree(void *ptr); void * ourcalloc(size_t count, size_t size); void * ourrealloc(void *ptr, size_t size); -*/ + */ #if 0 -void * model_malloc(size_t size); +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); +void *model_calloc(size_t count, size_t size); +void *model_realloc(void *ptr, size_t size); #define ourmalloc model_malloc @@ -45,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 */