diff options
author | Aina Niemetz <aina.niemetz@gmail.com> | 2018-10-01 11:36:45 -0700 |
---|---|---|
committer | Andres Noetzli <andres.noetzli@gmail.com> | 2018-10-01 11:36:45 -0700 |
commit | d41c0aa8c7ec8d14ce07f5817da38895598e55da (patch) | |
tree | 81d1767b4e2384df9d9a4fa90ed868d9419f9693 /src/prop/minisat/core | |
parent | da3b2212ed6befc0d29646ef65570919377913fe (diff) |
Fix compiler warnings. (#2555)
Diffstat (limited to 'src/prop/minisat/core')
-rw-r--r-- | src/prop/minisat/core/Solver.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/prop/minisat/core/Solver.cc b/src/prop/minisat/core/Solver.cc index dbe417dbc..c8a2e16c2 100644 --- a/src/prop/minisat/core/Solver.cc +++ b/src/prop/minisat/core/Solver.cc @@ -1349,15 +1349,16 @@ lbool Solver::search(int nof_conflicts) check_type = CHECK_WITH_THEORY; } - if (nof_conflicts >= 0 && conflictC >= nof_conflicts || - !withinBudget(options::satConflictStep())) { - // Reached bound on number of conflicts: - progress_estimate = progressEstimate(); - cancelUntil(0); - // [mdeters] notify theory engine of restarts for deferred - // theory processing - proxy->notifyRestart(); - return l_Undef; + if ((nof_conflicts >= 0 && conflictC >= nof_conflicts) + || !withinBudget(options::satConflictStep())) + { + // Reached bound on number of conflicts: + progress_estimate = progressEstimate(); + cancelUntil(0); + // [mdeters] notify theory engine of restarts for deferred + // theory processing + proxy->notifyRestart(); + return l_Undef; } // Simplify the set of problem clauses: |