X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=1a36a39dc040838f2c37b8166a8faf9b9a6a80fd;hb=HEAD;hp=0e5ba8656c605b5de48108eebf5fd17cee35a7f0;hpb=38c72a8748ae74a5bb8b75e713f363a49b48e7af;p=c11tester.git

diff --git a/clockvector.h b/clockvector.h
index 0e5ba865..1a36a39d 100644
--- 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__ */