mirror of
https://github.com/Z3Prover/z3
synced 2025-04-22 00:26:38 +00:00
fix
This commit is contained in:
parent
54487f3294
commit
a339cd1aff
2 changed files with 5 additions and 4 deletions
|
@ -168,9 +168,9 @@ namespace polysat {
|
|||
}
|
||||
|
||||
void slicing::undo_merge_base() {
|
||||
slice r1 = m_merge_trail.back();
|
||||
auto const [r1, s1] = m_merge_trail.back();
|
||||
m_merge_trail.pop_back();
|
||||
slice r2 = m_find[r1];
|
||||
slice const r2 = m_find[r1];
|
||||
SASSERT(find(r2) == r2);
|
||||
m_find[r1] = r1;
|
||||
m_size[r2] -= m_size[r1];
|
||||
|
|
|
@ -36,7 +36,8 @@ namespace polysat {
|
|||
typedef dd::bddv bddv;
|
||||
typedef dd::val_pp val_pp;
|
||||
|
||||
typedef unsigned pvar;
|
||||
using pvar = unsigned;
|
||||
using pvar_vector = unsigned_vector;
|
||||
inline const pvar null_var = UINT_MAX;
|
||||
|
||||
class dependency {
|
||||
|
@ -49,7 +50,7 @@ namespace polysat {
|
|||
};
|
||||
|
||||
inline const dependency null_dependency = dependency(UINT_MAX);
|
||||
typedef svector<dependency> dependency_vector;
|
||||
using dependency_vector = svector<dependency>;
|
||||
|
||||
inline bool operator< (dependency const& d1, dependency const& d2) { return d1.val() < d2.val(); }
|
||||
inline bool operator<=(dependency const& d1, dependency const& d2) { return d1.val() <= d2.val(); }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue