rename MYMALLOC -> model_malloc

[c11tester.git] / mymemory.h

diff --git a/mymemory.h b/mymemory.h
index fb6df12cd6791e85b1553d3c51da3ba89e67e2e2..21f636f584f7c6b66cbc534ef3708c2fe2f667f3 100644 (file)
--- a/mymemory.h
+++ b/mymemory.h
@@ -11,13 +11,13 @@
  *     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 ); \
        }\
        void * operator new[](size_t size) { \
-               return MYMALLOC(size);\
+               return model_malloc(size);\
        }\
        void operator delete[](void *p, size_t size) {\
                MYFREE(p);\
@@ -27,9 +27,20 @@
  *     memory in the snapshotting heap. */
 #define SNAPSHOTALLOC
 
-void *MYMALLOC(size_t size);
+void *model_malloc(size_t size);
+void *MYCALLOC(size_t count, size_t size);
 void MYFREE(void *ptr);
 
+static inline void * snapshot_malloc(size_t size) {
+       return malloc(size);
+}
+static inline void * snapshot_calloc(size_t count, size_t size) {
+       return calloc(count, size);
+}
+static inline void snapshot_free(void *ptr) {
+       free(ptr);
+}
+
 void system_free( void * ptr );
 void *system_malloc( size_t size );
 
@@ -89,7 +100,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;
        }