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

[c11tester.git] / clockvector.h

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;