mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

merge with 4.7.1

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-22 17:10:36 -07:00
commit 50c93d1ad4
25 changed files with 182 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/math/subpaving/subpaving.cpp
View file

@ -121,7 +121,7 @@ namespace subpaving {
int2mpf(c, m_c);
return m_ctx.mk_sum(m_c, sz, m_as.c_ptr(), xs);
}
catch (f2n<mpf_manager>::exception) {
catch (const f2n<mpf_manager>::exception &) {
throw subpaving::exception();
}
}
@ -135,7 +135,7 @@ namespace subpaving {
m.set(m_c, k);
return reinterpret_cast<ineq*>(m_ctx.mk_ineq(x, m_c, lower, open));
}
catch (f2n<mpf_manager>::exception) {
catch (const f2n<mpf_manager>::exception &) {
throw subpaving::exception();
}
}
@ -178,7 +178,7 @@ namespace subpaving {
int2hwf(c, m_c);
return m_ctx.mk_sum(m_c, sz, m_as.c_ptr(), xs);
}
catch (f2n<mpf_manager>::exception) {
catch (const f2n<mpf_manager>::exception &) {
throw subpaving::exception();
}
}
@ -192,7 +192,7 @@ namespace subpaving {
m.set(m_c, k);
return reinterpret_cast<ineq*>(m_ctx.mk_ineq(x, m_c, lower, open));
}
catch (f2n<mpf_manager>::exception) {
catch (const f2n<mpf_manager>::exception &) {
throw subpaving::exception();
}
}
@ -236,7 +236,7 @@ namespace subpaving {
int2fpoint(c, m_c);
return this->m_ctx.mk_sum(m_c, sz, m_as.c_ptr(), xs);
}
catch (typename context_fpoint::numeral_manager::exception) {
catch (const typename context_fpoint::numeral_manager::exception &) {
throw subpaving::exception();
}
}
@ -251,7 +251,7 @@ namespace subpaving {
m.set(m_c, m_qm, k);
return reinterpret_cast<ineq*>(this->m_ctx.mk_ineq(x, m_c, lower, open));
}
catch (typename context_fpoint::numeral_manager::exception) {
catch (const typename context_fpoint::numeral_manager::exception &) {
throw subpaving::exception();
}
}

4
src/math/subpaving/subpaving_t_def.h
View file

@ -1310,7 +1310,7 @@ bool context_t<C>::relevant_new_bound(var x, numeral const & k, bool lower, bool
TRACE("subpaving_relevant_bound", tout << "new bound is relevant\n";);
return true;
}
catch (typename C::exception) {
catch (const typename C::exception &) {
// arithmetic module failed.
set_arith_failed();
return false;
@ -1722,7 +1722,7 @@ void context_t<C>::propagate(node * n, bound * b) {
}
}
}
catch (typename C::exception) {
catch (const typename C::exception &) {
// arithmetic module failed, ignore constraint
set_arith_failed();
}