mymemory: define SNAPSHOTALLOC appropriately

[c11tester.git] / mymemory.h

diff --git a/mymemory.h b/mymemory.h
index fb6df12cd6791e85b1553d3c51da3ba89e67e2e2..1d4c123ef141134bdf246f07b25c965204921154 100644 (file)
--- a/mymemory.h
+++ b/mymemory.h
@@ -11,24 +11,41 @@
  *     memory in the non-snapshotting heap. */
 #define MEMALLOC \
        void * operator new(size_t size) { \
-               return MYMALLOC(size);\
-       }\
+               return model_malloc(size); \
+       } \
        void operator delete(void *p, size_t size) { \
-               MYFREE( p ); \
-       }\
+               model_free(p); \
+       } \
        void * operator new[](size_t size) { \
-               return MYMALLOC(size);\
-       }\
-       void operator delete[](void *p, size_t size) {\
-               MYFREE(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);
+void model_free(void *ptr);
 
-void *MYMALLOC(size_t size);
-void MYFREE(void *ptr);
+void * snapshot_malloc(size_t size);
+void * snapshot_calloc(size_t count, size_t size);
+void snapshot_free(void *ptr);
 
 void system_free( void * ptr );
 void *system_malloc( size_t size );
@@ -89,7 +106,7 @@ template <class T>
 
        // allocate but don't initialize num elements of type T
        pointer allocate (size_type num, const void* = 0) {
-           pointer p = ( pointer )MYMALLOC( num * sizeof( T ) );
+           pointer p = ( pointer )model_malloc( num * sizeof( T ) );
            return p;
        }
 
@@ -107,7 +124,7 @@ template <class T>
 
        // deallocate storage p of deleted elements
        void deallocate (pointer p, size_type num) {
-           MYFREE((void*)p);
+           model_free((void*)p);
        }
    };