From: Brian Norris <banorris@uci.edu>
Date: Wed, 11 Jul 2012 18:50:35 +0000 (-0700)
Subject: clockvector: add 'const', fix comments in ClockVector::merge()
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9603efba5f5006b21140286138ba7e003d29e997;p=c11tester.git

clockvector: add 'const', fix comments in ClockVector::merge()
---

diff --git a/clockvector.cc b/clockvector.cc
index cfd99c66..88ea6fdf 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;
diff --git a/clockvector.h b/clockvector.h
index 1428886c..56037eb6 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -16,7 +16,7 @@ class ClockVector {
 public:
 	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
+	void merge(const ClockVector *cv);
 	bool synchronized_since(const ModelAction *act) const;
 
 	void print() const;