X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=e19a2113a5e10f9860669656bb1583ec91da3620;hb=6b12232a5e3db3bc7f4cbcfa772ba86f1de04cc9;hp=9000a5d72eddd90ba1ba5964e4a12105a75ca9b1;hpb=e8e32b7efa96a0b36c1475b58368d002408a7ea7;p=c11tester.git

diff --git a/clockvector.h b/clockvector.h
index 9000a5d7..e19a2113 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -15,7 +15,7 @@ class ClockVector {
 public:
 	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
 	~ClockVector();
-	void merge(const ClockVector *cv);
+	bool merge(const ClockVector *cv);
 	bool synchronized_since(const ModelAction *act) const;
 
 	void print() const;