X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.cc;h=da459d0e0faf461aab67af55ab7f3338082fdd9d;hp=15e65909d0a16890b6de65a7a961fb36bf807028;hb=5f6fdf806a3389a8318011023ccc6f45389624af;hpb=7ff2770de1315e88ea63e21dbaee9edda0e39827

diff --git a/clockvector.cc b/clockvector.cc
index 15e65909..da459d0e 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -11,7 +11,7 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 	num_threads = parent ? parent->num_threads : 1;
 	if (act && act->get_type() == THREAD_CREATE)
 		num_threads++;
-	clock = (int *)myMalloc(num_threads * sizeof(int));
+	clock = (int *)MYMALLOC(num_threads * sizeof(int));
 	if (parent)
 		std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int));
 	else
@@ -23,7 +23,7 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 
 ClockVector::~ClockVector()
 {
-	myFree(clock);
+	MYFREE(clock);
 }
 
 void ClockVector::merge(ClockVector *cv)
@@ -35,7 +35,7 @@ void ClockVector::merge(ClockVector *cv)
 
 	if (cv->num_threads > num_threads) {
 		resize = true;
-		clk = (int *)myMalloc(cv->num_threads * sizeof(int));
+		clk = (int *)MYMALLOC(cv->num_threads * sizeof(int));
 	}
 
 	/* Element-wise maximum */
@@ -46,7 +46,7 @@ void ClockVector::merge(ClockVector *cv)
 		for (int i = num_threads; i < cv->num_threads; i++)
 			clk[i] = cv->clock[i];
 		num_threads = cv->num_threads;
-		myFree(clock);
+		MYFREE(clock);
 	}
 	clock = clk;
 }