X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=1a36a39dc040838f2c37b8166a8faf9b9a6a80fd;hb=HEAD;hp=1428886c80f692891a8103be8e721bc07644cdf7;hpb=fb2ab76b04c83faa654c8819c8e39b1e5fcc7d75;p=c11tester.git

diff --git a/clockvector.h b/clockvector.h
index 1428886c..1a36a39d 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -5,24 +5,22 @@
 #ifndef __CLOCKVECTOR_H__
 #define __CLOCKVECTOR_H__
 
-#include "threads.h"
 #include "mymemory.h"
-
-typedef unsigned int modelclock_t;
-/* Forward declaration */
-class ModelAction;
+#include "modeltypes.h"
+#include "classlist.h"
 
 class ClockVector {
 public:
-	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
+	ClockVector(ClockVector *parent = NULL, const ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
+	bool merge(const ClockVector *cv);
+	bool minmerge(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;
@@ -31,4 +29,4 @@ private:
 	int num_threads;
 };
 
-#endif /* __CLOCKVECTOR_H__ */
+#endif	/* __CLOCKVECTOR_H__ */