You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

35 lines
1.1 KiB

  1. diff --git a/src/ItpGlucose.h b/src/ItpGlucose.h
  2. index 657253d..66a0cd4 100644
  3. --- a/src/ItpGlucose.h
  4. +++ b/src/ItpGlucose.h
  5. @@ -126,7 +126,7 @@ namespace avy
  6. ::Glucose::Solver* get () { return m_pSat; }
  7. /// true if the context is decided
  8. - bool isSolved () { return m_Trivial || m_State || !m_State; }
  9. + bool isSolved () { return bool{m_Trivial || m_State || !m_State}; }
  10. int core (int **out)
  11. {
  12. @@ -182,7 +182,8 @@ namespace avy
  13. bool getVarVal(int v)
  14. {
  15. ::Glucose::Var x = v;
  16. - return tobool (m_pSat->modelValue(x));
  17. + boost::logic::tribool y = tobool (m_pSat->modelValue(x));
  18. + return bool{y};
  19. }
  20. };
  21. diff --git a/src/ItpMinisat.h b/src/ItpMinisat.h
  22. index d145d7c..7514f31 100644
  23. --- a/src/ItpMinisat.h
  24. +++ b/src/ItpMinisat.h
  25. @@ -124,7 +124,7 @@ namespace avy
  26. ::Minisat::Solver* get () { return m_pSat.get (); }
  27. /// true if the context is decided
  28. - bool isSolved () { return m_Trivial || m_State || !m_State; }
  29. + bool isSolved () { return bool{m_Trivial || m_State || !m_State}; }
  30. int core (int **out)
  31. {