mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 10:55:50 +00:00
Code Activity

merge with master branch

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-09-19 09:39:22 -07:00
commit 651587ce01
1602 changed files with 40496 additions and 27837 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/solver/combined_solver.cpp
View file

@ -18,10 +18,10 @@ Author:
Notes:
--*/
#include"solver.h"
#include"scoped_timer.h"
#include"combined_solver_params.hpp"
#include"common_msgs.h"
#include "solver/solver.h"
#include "util/scoped_timer.h"
#include "solver/combined_solver_params.hpp"
#include "util/common_msgs.h"
#define PS_VB_LVL 15
/**
@ -89,8 +89,8 @@ private:
m_solver->get_manager().limit().dec_cancel();
}
}
virtual void operator()() {
m_canceled = true;
virtual void operator()(event_handler_caller_t caller_id) {
m_canceled = true;
m_solver->get_manager().limit().inc_cancel();
}
};