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

diff --git a/clockvector.cc b/clockvector.cc
index cfd99c66177568a642947c2959d87582010282c8..88ea6fdfcf7cc73a8b99239e9128180883ca55bb 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;

diff --git a/clockvector.h b/clockvector.h
index 1428886c80f692891a8103be8e721bc07644cdf7..56037eb6bfcd2f37a5110d12a7f733e79faad8b0 100644 (file)
--- 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;