mirror of
https://github.com/Z3Prover/z3
synced 2025-04-14 21:08:46 +00:00
fix warnings, avoid class qualification in static function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
7731163d11
commit
f12f83af83
|
@ -260,7 +260,7 @@ namespace smt {
|
||||||
struct var_value_hash {
|
struct var_value_hash {
|
||||||
imp & m_th;
|
imp & m_th;
|
||||||
var_value_hash(imp & th):m_th(th) {}
|
var_value_hash(imp & th):m_th(th) {}
|
||||||
unsigned operator()(theory_var v) const { return std::hash<lean::impq>()(m_th.get_ivalue(v)); }
|
unsigned operator()(theory_var v) const { return (unsigned)std::hash<lean::impq>()(m_th.get_ivalue(v)); }
|
||||||
};
|
};
|
||||||
int_hashtable<var_value_hash, var_value_eq> m_model_eqs;
|
int_hashtable<var_value_hash, var_value_eq> m_model_eqs;
|
||||||
|
|
||||||
|
@ -1307,7 +1307,7 @@ namespace smt {
|
||||||
set_conflict();
|
set_conflict();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (size_t i = 0; !m.canceled() && !ctx().inconsistent() && i < bp.m_ibounds.size(); ++i) {
|
for (unsigned i = 0; !m.canceled() && !ctx().inconsistent() && i < bp.m_ibounds.size(); ++i) {
|
||||||
propagate_lp_solver_bound(bp.m_ibounds[i]);
|
propagate_lp_solver_bound(bp.m_ibounds[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ struct conversion_helper {
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
struct conversion_helper <double> {
|
struct conversion_helper <double> {
|
||||||
static double conversion_helper <double>::get_upper_bound(const column_info<mpq> & ci) {
|
static double get_upper_bound(const column_info<mpq> & ci) {
|
||||||
if (!ci.upper_bound_is_strict())
|
if (!ci.upper_bound_is_strict())
|
||||||
return ci.get_upper_bound().get_double();
|
return ci.get_upper_bound().get_double();
|
||||||
double eps = 0.00001;
|
double eps = 0.00001;
|
||||||
|
|
Loading…
Reference in a new issue