X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=739a336e1adc6c81178686c10da60d411cd903b8;hb=bad8cc4598438f8b8d9e8fa210e2790f92c9ec44;hp=1428886c80f692891a8103be8e721bc07644cdf7;hpb=fb2ab76b04c83faa654c8819c8e39b1e5fcc7d75;p=model-checker.git

diff --git a/clockvector.h b/clockvector.h
index 1428886..739a336 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -16,13 +16,14 @@ class ClockVector {
 public:
 	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
+	void 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);
 
-	MEMALLOC
+	SNAPSHOTALLOC
 private:
 	/** @brief Holds the actual clock data, as an array. */
 	modelclock_t *clock;