X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=ba5d1f4b2e627a76e41a8e40589b833fc00dd584;hb=HEAD;hp=5e25e00f1ac625fc0c116b563dd83ffd4040d296;hpb=9077381b71d4e95f5e25204480159decf16281a7;p=c11tester.git

diff --git a/clockvector.cc b/clockvector.cc
index 5e25e00f..ba5d1f4b 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -24,7 +24,7 @@ ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
 
 	clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
 	if (parent)
-		std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
+		real_memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
 	if (act != NULL)
 		clock[id_to_int(act->get_tid())] = act->get_seq_number();
@@ -78,7 +78,7 @@ bool ClockVector::minmerge(const ClockVector *cv)
 		num_threads = cv->num_threads;
 	}
 
-	/* Element-wise maximum */
+	/* Element-wise minimum */
 	for (int i = 0;i < cv->num_threads;i++)
 		if (cv->clock[i] < clock[i]) {
 			clock[i] = cv->clock[i];