mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-24 03:57:51 +00:00
Code Activity

Merge branch 'bvsls' of https://git01.codeplex.com/z3 into bvsls

Browse source 
Conflicts:
	src/tactic/sls/sls_evaluator.h
	src/tactic/sls/sls_tactic.cpp
	src/tactic/sls/sls_tracker.h
This commit is contained in:
Andreas Froehlich 2014-03-19 12:09:29 +00:00
commit eabebedabf
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tactic/sls/sls_evaluator.h
View file

@ -586,7 +586,7 @@ public:
#else
m_tracker.set_score(cur, m_tracker.score(cur));
#endif
#endif
#endif
if (m_tracker.has_uplinks(cur)) {
ptr_vector<expr> & ups = m_tracker.get_uplinks(cur);
for (unsigned j = 0; j < ups.size(); j++) {
@ -645,7 +645,7 @@ public:
#else
m_tracker.set_score(cur, m_tracker.score(cur));
#endif
#endif
#endif
if (m_tracker.has_uplinks(cur)) {
ptr_vector<expr> & ups = m_tracker.get_uplinks(cur);
for (unsigned j = 0; j < ups.size(); j++) {