X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=clockvector.h;h=e19a2113a5e10f9860669656bb1583ec91da3620;hp=1428886c80f692891a8103be8e721bc07644cdf7;hb=91d6d898388c1f8de1669b0bd59bfe9a78f3cf6b;hpb=1745637aab8a1d85eb605b9ef9e92d4fbb437633

diff --git a/clockvector.h b/clockvector.h
index 1428886..e19a211 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;
 
@@ -16,13 +15,13 @@ class ClockVector {
 public:
 	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
+	bool merge(const ClockVector *cv);
 	bool synchronized_since(const ModelAction *act) 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;