Merge branch 'master' into brian

[model-checker.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 162a7c2550db61c3845885349a01b76e6fd84838..190f9216a92b61ad68df0990775d4c978aaa53f9 100644 (file)
--- 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;