3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-02 12:21:21 +00:00

fix openmp nested critical section

Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
This commit is contained in:
Nikolaj Bjorner 2015-05-18 12:43:55 -07:00
parent d8dc86f558
commit c36df1c34a
2 changed files with 3 additions and 3 deletions

View file

@ -656,13 +656,12 @@ public:
} }
virtual void set_cancel(bool f) { virtual void set_cancel(bool f) {
m_nl_tac->set_cancel(f);
if (f) { if (f) {
m_nl_tac->cancel();
m_solver->cancel(); m_solver->cancel();
} }
else { else {
m_solver->reset_cancel(); m_solver->reset_cancel();
m_nl_tac->reset_cancel();
} }
m_cancel = f; m_cancel = f;
} }

View file

@ -95,10 +95,11 @@ public:
// translate tactic to the given manager // translate tactic to the given manager
virtual tactic * translate(ast_manager & m) = 0; virtual tactic * translate(ast_manager & m) = 0;
private: protected:
friend class nary_tactical; friend class nary_tactical;
friend class binary_tactical; friend class binary_tactical;
friend class unary_tactical; friend class unary_tactical;
friend class nl_purify_tactic;
virtual void set_cancel(bool f) {} virtual void set_cancel(bool f) {}