X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mymemory.h;h=6b35f5d14f0efb46738d9389c2e8af72c9d3c6a7;hb=7c77391dff9f4cf3166d47015494f0af276963f0;hp=21f636f584f7c6b66cbc534ef3708c2fe2f667f3;hpb=f01c21655bce58ff70b0e8936f2579a7beeafad4;p=model-checker.git

diff --git a/mymemory.h b/mymemory.h
index 21f636f..6b35f5d 100644
--- 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,8 +28,8 @@
 #define SNAPSHOTALLOC
 
 void *model_malloc(size_t size);
-void *MYCALLOC(size_t count, size_t size);
-void MYFREE(void *ptr);
+void *model_calloc(size_t count, size_t size);
+void model_free(void *ptr);
 
 static inline void * snapshot_malloc(size_t size) {
 	return malloc(size);
@@ -118,7 +118,7 @@ template <class T>
 
        // deallocate storage p of deleted elements
        void deallocate (pointer p, size_type num) {
-           MYFREE((void*)p);
+           model_free((void*)p);
        }
    };