X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=962e9ec4844995c811638030d5a7c11a983ea36e;hb=02e8c0e82227e667163f370f663935272599a4ba;hp=9000a5d72eddd90ba1ba5964e4a12105a75ca9b1;hpb=15fabc6f4e6591341940a8087a8dd088af59bb5c;p=c11tester.git

diff --git a/clockvector.h b/clockvector.h
index 9000a5d7..962e9ec4 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -7,15 +7,13 @@
 
 #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 synchronized_since(const ModelAction *act) const;
 
 	void print() const;
@@ -30,4 +28,4 @@ private:
 	int num_threads;
 };
 
-#endif /* __CLOCKVECTOR_H__ */
+#endif	/* __CLOCKVECTOR_H__ */