X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mymemory.h;fp=mymemory.h;h=1d4c123ef141134bdf246f07b25c965204921154;hb=8497408d26002ec1a9d7cfd42458f92f2cdd9864;hp=c49984ffb62d4aba71f379cdd168a032940c48e5;hpb=328a2c09c2ee06d0e1c49ccb84877fa17b436a01;p=model-checker.git diff --git a/mymemory.h b/mymemory.h index c49984f..1d4c123 100644 --- a/mymemory.h +++ b/mymemory.h @@ -11,21 +11,33 @@ * memory in the non-snapshotting heap. */ #define MEMALLOC \ void * operator new(size_t size) { \ - return model_malloc(size);\ - }\ + return model_malloc(size); \ + } \ void operator delete(void *p, size_t size) { \ - model_free( p ); \ - }\ + model_free(p); \ + } \ void * operator new[](size_t size) { \ - return model_malloc(size);\ - }\ - void operator delete[](void *p, size_t size) {\ - model_free(p);\ + return model_malloc(size); \ + } \ + void operator delete[](void *p, size_t size) { \ + model_free(p); \ } /** SNAPSHOTALLOC declares the allocators for a class to allocate * memory in the snapshotting heap. */ -#define SNAPSHOTALLOC +#define SNAPSHOTALLOC \ + void * operator new(size_t size) { \ + return snapshot_malloc(size); \ + } \ + void operator delete(void *p, size_t size) { \ + snapshot_free(p); \ + } \ + void * operator new[](size_t size) { \ + return snapshot_malloc(size); \ + } \ + void operator delete[](void *p, size_t size) { \ + snapshot_free(p); \ + } void *model_malloc(size_t size); void *model_calloc(size_t count, size_t size);