X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=6a902c5215342bae0313d56b3e6cfa8267bd79cf;hb=b927f3521995cdb7adab6059f1fa81b8d2e545f3;hp=56037eb6bfcd2f37a5110d12a7f733e79faad8b0;hpb=9603efba5f5006b21140286138ba7e003d29e997;p=model-checker.git

diff --git a/clockvector.h b/clockvector.h
index 56037eb..6a902c5 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -5,10 +5,9 @@
 #ifndef __CLOCKVECTOR_H__
 #define __CLOCKVECTOR_H__
 
-#include "threads.h"
 #include "mymemory.h"
+#include "modeltypes.h"
 
-typedef unsigned int modelclock_t;
 /* Forward declaration */
 class ModelAction;
 
@@ -18,11 +17,12 @@ public:
 	~ClockVector();
 	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;