X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=clockvector.cc;h=6c6e2fa579e606377ec45bed18bddac8d357cbb8;hb=66a8501ed6eecc5e1ce308235ad7226da363b70e;hp=5a7c5349b3cd98ad446e0eb90189cd4b695dbbfa;hpb=75ecaf106e4fc0d2ad2f3d82d089cf8a9956e41a;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 5a7c534..6c6e2fa 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;
@@ -75,7 +75,7 @@ void ClockVector::merge(ClockVector *cv)
  * thread, false otherwise. That is, this function returns:
  * <BR><CODE>act <= cv[act->tid]</CODE>
  */
-bool ClockVector::synchronized_since(ModelAction *act) const
+bool ClockVector::synchronized_since(const ModelAction *act) const
 {
 	int i = id_to_int(act->get_tid());
 
@@ -84,11 +84,8 @@ bool ClockVector::synchronized_since(ModelAction *act) const
 	return false;
 }
 
-/** 
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
-
-int ClockVector::getClock(thread_id_t thread) {
+/** 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);
 
 	if (threadid < num_threads)