X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.h;h=1a36a39dc040838f2c37b8166a8faf9b9a6a80fd;hp=430dc1771bc9c03f09bfbb01f2e16e46c4744e57;hb=3f376daab54b640efb30700f83bc3ab1cfb88848;hpb=995962127d29a128fa2de578f47953308600b605

diff --git a/clockvector.h b/clockvector.h
index 430dc177..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;