check_recency: improve templates, use when reading from Promise

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 3f4ca001aa8c85d85564cf012d10bf37b6182614..d8c1be495075f2e276c770acab49cd7bbe29ea89 100644 (file)
--- a/model.h
+++ b/model.h
@@ -167,10 +167,11 @@ private:
 
        Thread * take_step(ModelAction *curr);
 
-       bool check_recency(ModelAction *curr, const ModelAction *rf) const;
-
        template <typename T>
-       bool should_read_instead(const ModelAction *curr, const ModelAction *rf, const T *other_rf) const;
+       bool check_recency(ModelAction *curr, const T *rf) const;
+
+       template <typename T, typename U>
+       bool should_read_instead(const ModelAction *curr, const T *rf, const U *other_rf) const;
 
        ModelAction * get_last_fence_conflict(ModelAction *act) const;
        ModelAction * get_last_conflict(ModelAction *act) const;