Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

[model-checker.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index a825bb940f66f4331e723eadd8983f9bd8d05e70..80c1b953ff6855e24d058ddffa6589f29a6dda1f 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -3,12 +3,12 @@
 #include "snapshotimp.h"
 #include <stdio.h>
 #include <dlfcn.h>
-#if !USE_CHECKPOINTING
+#if !USE_MPROTECT_SNAPSHOT
 static mspace sStaticSpace = NULL;
 #endif
 
 void *MYMALLOC(size_t size) {
-#if USE_CHECKPOINTING
+#if USE_MPROTECT_SNAPSHOT
        static void *(*mallocp)(size_t size);
        char *error;
        void *ptr;
@@ -34,7 +34,7 @@ void *MYMALLOC(size_t size) {
 }
 
 void MYFREE(void *ptr) {
-#if USE_CHECKPOINTING
+#if USE_MPROTECT_SNAPSHOT
        static void (*freep)(void *);
        char *error;
 
@@ -63,9 +63,17 @@ void free( void * ptr ){
 }
 
 void * operator new(size_t size) throw(std::bad_alloc) {
-       return MYMALLOC(size);
+       return malloc(size);
 }
 
 void operator delete(void *p) throw() {
-       MYFREE(p);
+       free(p);
+}
+
+void * operator new[](size_t size) throw(std::bad_alloc) {
+       return malloc(size);
+}
+
+void operator delete[](void *p, size_t size) {
+       free(p);
 }