X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=6c6e2fa579e606377ec45bed18bddac8d357cbb8;hb=88ccfdff63126a0fa70c094c7ed7e66f68e1b861;hp=cfd99c66177568a642947c2959d87582010282c8;hpb=1745637aab8a1d85eb605b9ef9e92d4fbb437633;p=c11tester.git

diff --git a/clockvector.cc b/clockvector.cc
index cfd99c66..6c6e2fa5 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -34,11 +34,11 @@ ClockVector::~ClockVector()
 }
 
 /**
- * Merge a clock vector into this vector, using a pairwise vector. The
+ * Merge a clock vector into this vector, using a pairwise comparison. The
  * resulting vector length will be the maximum length of the two being merged.
  * @param cv is the ClockVector being merged into this vector.
  */
-void ClockVector::merge(ClockVector *cv)
+void ClockVector::merge(const ClockVector *cv)
 {
 	modelclock_t *clk = clock;
 	bool resize = false;
@@ -84,10 +84,7 @@ bool ClockVector::synchronized_since(const ModelAction *act) const
 	return false;
 }
 
-/** 
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
-
+/** Gets the clock corresponding to a given thread id from the clock vector. */
 modelclock_t ClockVector::getClock(thread_id_t thread) {
 	int threadid = id_to_int(thread);