mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Code Activity

Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable

Browse source
This commit is contained in:
Nikolaj Bjorner 2015-05-18 14:51:27 -07:00
parent 014fb7f6b7 c36df1c34a
commit c17fd2d516
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tactic/nlsat_smt/nl_purify_tactic.cpp
View file

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

3
src/tactic/tactic.h
View file

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