mirror of
https://github.com/Z3Prover/z3
synced 2025-04-24 01:25:31 +00:00
Merge conflicts
This commit is contained in:
commit
0acf331ed1
5 changed files with 111 additions and 38 deletions
|
@ -48,6 +48,7 @@ namespace opt {
|
|||
expr_ref_vector m_aux;
|
||||
expr_ref_vector m_assignment;
|
||||
unsigned m_upper_size;
|
||||
|
||||
solver & m_original_solver;
|
||||
bool m_use_new_bv_solver;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue