X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=e19a2113a5e10f9860669656bb1583ec91da3620;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=6a902c5215342bae0313d56b3e6cfa8267bd79cf;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621;p=model-checker.git

diff --git a/clockvector.h b/clockvector.h
index 6a902c5..e19a211 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -15,9 +15,8 @@ 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;
-	bool has_synchronized_with(const ClockVector *cv) const;
 
 	void print() const;
 	modelclock_t getClock(thread_id_t thread);