X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=clockvector.h;h=9000a5d72eddd90ba1ba5964e4a12105a75ca9b1;hp=f2716dbd90497c9f260b1730bee9d25bc9c622fd;hb=58a4edbf1f1eba39ebe6386df49ea6ff7655a206;hpb=53748c53db55c1230d4b191caf0e4016a2b9c0a6

diff --git a/clockvector.h b/clockvector.h
index f2716db..9000a5d 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,12 +17,11 @@ 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;