fix conflict

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 682e94b15017ef2c16d4dd0085f9a7ed99cb3644..74496c67d9eae8538d4ad9eaaf3c1d4345598b8e 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -68,7 +68,11 @@ public:
        bool check_action_enabled(ModelAction *curr);
 
        bool assert_bug(const char *msg);
+       bool assert_race(const char *msg);
+
        bool have_bug_reports() const;
+       bool have_fatal_bug_reports() const;
+
        SnapVector<bug_message *> * get_bugs() const;
 
        bool has_asserted() const;