model: add read-acquire/fence-release support

[c11tester.git] / clockvector.h

diff --git a/clockvector.h b/clockvector.h
index 1428886c80f692891a8103be8e721bc07644cdf7..9000a5d72eddd90ba1ba5964e4a12105a75ca9b1 100644 (file)
--- 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);
+       void 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;