fix mutex_trylock bug

[c11tester.git] / clockvector.h

diff --git a/clockvector.h b/clockvector.h
index 9000a5d72eddd90ba1ba5964e4a12105a75ca9b1..1a36a39dc040838f2c37b8166a8faf9b9a6a80fd 100644 (file)
--- a/clockvector.h
+++ b/clockvector.h
@@ -7,15 +7,14 @@
 
 #include "mymemory.h"
 #include "modeltypes.h"
-
-/* Forward declaration */
-class ModelAction;
+#include "classlist.h"
 
 class ClockVector {
 public:
-       ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
+       ClockVector(ClockVector *parent = NULL, const ModelAction *act = NULL);
        ~ClockVector();
-       void merge(const ClockVector *cv);
+       bool merge(const ClockVector *cv);
+       bool minmerge(const ClockVector *cv);
        bool synchronized_since(const ModelAction *act) const;
 
        void print() const;
@@ -30,4 +29,4 @@ private:
        int num_threads;
 };
 
-#endif /* __CLOCKVECTOR_H__ */
+#endif /* __CLOCKVECTOR_H__ */