X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=6685ab365c64179ff91c303cf19b8fd709da05c4;hb=63e202b2db7a90e176db54c864d2e54ec535c03f;hp=960e9e1a9846a8eefd92a7f0ef394eb975adcbca;hpb=523dbecc6fc18e58918a1f36860be5eb0ab42ce2;p=model-checker.git

diff --git a/model.h b/model.h
index 960e9e1..6685ab3 100644
--- a/model.h
+++ b/model.h
@@ -183,7 +183,10 @@ private:
 	void build_reads_from_past(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
 	void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
-	bool r_modification_order(ModelAction *curr, const ModelAction *rf);
+
+	template <typename rf_type>
+	bool r_modification_order(ModelAction *curr, const rf_type *rf);
+
 	bool w_modification_order(ModelAction *curr);
 	void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
 	bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
@@ -257,7 +260,6 @@ private:
 
 	void print_infeasibility(const char *prefix) const;
 	bool is_feasible_prefix_ignore_relseq() const;
-	bool is_infeasible_ignoreRMW() const;
 	bool is_infeasible() const;
 	bool is_deadlocked() const;
 	bool is_complete_execution() const;