Browse Source

Fixed more missing ifdefs.

Former-commit-id: be15e6a4c0
tempestpy_adaptions
dehnert 10 years ago
parent
commit
6142c6c3b7
  1. 4
      src/solver/MathsatSmtSolver.cpp
  2. 6
      src/solver/Z3SmtSolver.cpp

4
src/solver/MathsatSmtSolver.cpp

@ -64,9 +64,9 @@ namespace storm {
}
#endif
MathsatSmtSolver::MathsatSmtSolver(storm::expressions::ExpressionManager& manager, Options const& options)
MathsatSmtSolver::MathsatSmtSolver(storm::expressions::ExpressionManager& manager, Options const& options) : SmtSolver(manager)
#ifdef STORM_HAVE_MSAT
: SmtSolver(manager), expressionAdapter(nullptr), lastCheckAssumptions(false), lastResult(CheckResult::Unknown)
, expressionAdapter(nullptr), lastCheckAssumptions(false), lastResult(CheckResult::Unknown)
#endif
{
#ifdef STORM_HAVE_MSAT

6
src/solver/Z3SmtSolver.cpp

@ -44,16 +44,18 @@ namespace storm {
#endif
}
Z3SmtSolver::Z3SmtSolver(storm::expressions::ExpressionManager& manager)
Z3SmtSolver::Z3SmtSolver(storm::expressions::ExpressionManager& manager) : SmtSolver(manager)
#ifdef STORM_HAVE_Z3
: SmtSolver(manager), context(nullptr), solver(nullptr), expressionAdapter(nullptr), lastCheckAssumptions(false), lastResult(CheckResult::Unknown)
, context(nullptr), solver(nullptr), expressionAdapter(nullptr), lastCheckAssumptions(false), lastResult(CheckResult::Unknown)
#endif
{
#ifdef STORM_HAVE_Z3
z3::config config;
config.set("model", true);
context = std::unique_ptr<z3::context>(new z3::context(config));
solver = std::unique_ptr<z3::solver>(new z3::solver(*context));
expressionAdapter = std::unique_ptr<storm::adapters::Z3ExpressionAdapter>(new storm::adapters::Z3ExpressionAdapter(this->getManager(), *context));
#endif
}
Z3SmtSolver::~Z3SmtSolver() {

Loading…
Cancel
Save