mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-22 13:53:39 +00:00
Code Activity

fix compiler errors reported by Robert White

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-04-22 16:59:40 +02:00
parent 3003049df8
commit d67b5226f0
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/opt/opt_sls_solver.h
View file

@ -93,7 +93,7 @@ namespace opt {
std::cout << "set cancel\n"; std::cout << "set cancel\n";
m_solver->set_cancel(f); m_solver->set_cancel(f);
m_pb2bv.set_cancel(f); m_pb2bv.set_cancel(f);
#pragma omp critical (this) #pragma omp critical (sls_solver)
{ {
if (m_bvsls) { if (m_bvsls) {
m_bvsls->set_cancel(f); m_bvsls->set_cancel(f);
@ -193,7 +193,7 @@ namespace opt {
} }
void pbsls_opt() { void pbsls_opt() {
#pragma omp critical (this) #pragma omp critical (sls_solver)
{ {
m_pbsls = alloc(smt::pb_sls, m); m_pbsls = alloc(smt::pb_sls, m);
} }
@ -212,21 +212,22 @@ namespace opt {
} }
void bvsls_opt() { void bvsls_opt() {
#pragma omp critical (this) #pragma omp critical (sls_solver)
{ {
m_bvsls = alloc(bvsls_opt_engine, m, m_params); m_bvsls = alloc(bvsls_opt_engine, m, m_params);
} }
assertions2sls(); assertions2sls();
expr_ref objective = soft2bv(); expr_ref objective = soft2bv();
opt_result or(m); opt_result res(m);
res.is_sat = l_undef;
try { try {
or = m_bvsls->optimize(objective, m_model, true); res = m_bvsls->optimize(objective, m_model, true);
} }
catch (...) { catch (...) {
} }
SASSERT(or.is_sat == l_true || or.is_sat == l_undef); SASSERT(res.is_sat == l_true || res.is_sat == l_undef);
if (or.is_sat == l_true) { if (res.is_sat == l_true) {
m_bvsls->get_model(m_model); m_bvsls->get_model(m_model);
} }
} }