fix mutex_trylock bug

[c11tester.git] / clockvector.h

diff --git a/clockvector.h b/clockvector.h
index b9987b22a6f310a70fda2d39ede5fe84ccc62906..1a36a39dc040838f2c37b8166a8faf9b9a6a80fd 100644 (file)
--- a/clockvector.h
+++ b/clockvector.h
@@ -11,9 +11,10 @@
 
 class ClockVector {
 public:
-       ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
+       ClockVector(ClockVector *parent = NULL, const ModelAction *act = NULL);
        ~ClockVector();
        bool merge(const ClockVector *cv);
+       bool minmerge(const ClockVector *cv);
        bool synchronized_since(const ModelAction *act) const;
 
        void print() const;
@@ -28,4 +29,4 @@ private:
        int num_threads;
 };
 
-#endif/* __CLOCKVECTOR_H__ */
+#endif /* __CLOCKVECTOR_H__ */