replace malloc/calloc/free with snapshot_{malloc/calloc/free}

[cdsspec-compiler.git] / mymemory.h

diff --git a/mymemory.h b/mymemory.h
index 21f636f584f7c6b66cbc534ef3708c2fe2f667f3..c49984ffb62d4aba71f379cdd168a032940c48e5 100644 (file)
--- a/mymemory.h
+++ b/mymemory.h
@@ -14,13 +14,13 @@
                return model_malloc(size);\
        }\
        void operator delete(void *p, size_t size) { \
-               MYFREE( p ); \
+               model_free( p ); \
        }\
        void * operator new[](size_t size) { \
                return model_malloc(size);\
        }\
        void operator delete[](void *p, size_t size) {\
-               MYFREE(p);\
+               model_free(p);\
        }
 
 /** SNAPSHOTALLOC declares the allocators for a class to allocate
@@ -28,18 +28,12 @@
 #define SNAPSHOTALLOC
 
 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 *model_calloc(size_t count, size_t size);
+void model_free(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 );
@@ -118,7 +112,7 @@ template <class T>
 
        // deallocate storage p of deleted elements
        void deallocate (pointer p, size_type num) {
-           MYFREE((void*)p);
+           model_free((void*)p);
        }
    };