From d0d5217885f2ac11f7ae82038ce5b6a61ab56b20 Mon Sep 17 00:00:00 2001 From: TimQu Date: Sat, 11 Nov 2017 08:03:06 +0100 Subject: [PATCH] implementing destructors in implementation file. --- src/storm/environment/Environment.cpp | 4 ++++ src/storm/environment/Environment.h | 2 +- src/storm/environment/environments.h | 4 ++-- src/storm/environment/solver/MinMaxSolverEnvironment.cpp | 5 +++++ src/storm/environment/solver/MinMaxSolverEnvironment.h | 1 + src/storm/environment/solver/SolverEnvironment.cpp | 3 +++ src/storm/environment/solver/SolverEnvironment.h | 1 + 7 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/storm/environment/Environment.cpp b/src/storm/environment/Environment.cpp index 35b8c34a9..245c9f13b 100644 --- a/src/storm/environment/Environment.cpp +++ b/src/storm/environment/Environment.cpp @@ -9,6 +9,10 @@ namespace storm { // Intentionally left empty. } + Environment::~Environment() { + // Intentionally left empty. + } + SolverEnvironment& Environment::solver() { return *solverEnvironment; } diff --git a/src/storm/environment/Environment.h b/src/storm/environment/Environment.h index e73630b06..67a29a499 100644 --- a/src/storm/environment/Environment.h +++ b/src/storm/environment/Environment.h @@ -13,7 +13,7 @@ namespace storm { Environment(); - virtual ~Environment() = default; + virtual ~Environment(); SolverEnvironment& solver(); SolverEnvironment const& solver() const; diff --git a/src/storm/environment/environments.h b/src/storm/environment/environments.h index 44b11f007..5023df214 100644 --- a/src/storm/environment/environments.h +++ b/src/storm/environment/environments.h @@ -1,6 +1,6 @@ #pragma once #include "storm/environment/Environment.h" -#include "storm/environment/solver/SolverEnvironment.h" -#include "storm/environment/solver/MinMaxSolverEnvironment.h" +//#include "storm/environment/solver/SolverEnvironment.h" +//#include "storm/environment/solver/MinMaxSolverEnvironment.h" diff --git a/src/storm/environment/solver/MinMaxSolverEnvironment.cpp b/src/storm/environment/solver/MinMaxSolverEnvironment.cpp index 3c3c9b2c1..2c5d322eb 100644 --- a/src/storm/environment/solver/MinMaxSolverEnvironment.cpp +++ b/src/storm/environment/solver/MinMaxSolverEnvironment.cpp @@ -21,6 +21,11 @@ namespace storm { multiplicationStyle = minMaxSettings.getValueIterationMultiplicationStyle(); } + MinMaxSolverEnvironment::~MinMaxSolverEnvironment() { + // Intentionally left empty + } + + storm::solver::MinMaxMethod const& MinMaxSolverEnvironment::getMethod() const { return minMaxMethod; } diff --git a/src/storm/environment/solver/MinMaxSolverEnvironment.h b/src/storm/environment/solver/MinMaxSolverEnvironment.h index 340a2e2bd..67921e1cf 100644 --- a/src/storm/environment/solver/MinMaxSolverEnvironment.h +++ b/src/storm/environment/solver/MinMaxSolverEnvironment.h @@ -10,6 +10,7 @@ namespace storm { public: MinMaxSolverEnvironment(); + ~MinMaxSolverEnvironment(); storm::solver::MinMaxMethod const& getMethod() const; bool const& isMethodSetFromDefault() const; diff --git a/src/storm/environment/solver/SolverEnvironment.cpp b/src/storm/environment/solver/SolverEnvironment.cpp index 60899ce0f..11a43d4ee 100644 --- a/src/storm/environment/solver/SolverEnvironment.cpp +++ b/src/storm/environment/solver/SolverEnvironment.cpp @@ -10,6 +10,9 @@ namespace storm { // nativeSolverEnvironment(std::make_unique()) { { } + SolverEnvironment::~SolverEnvironment() { + // Intentionally left empty + } MinMaxSolverEnvironment& SolverEnvironment::minMax() { return *minMaxSolverEnvironment; diff --git a/src/storm/environment/solver/SolverEnvironment.h b/src/storm/environment/solver/SolverEnvironment.h index b808738c7..5a936b3be 100644 --- a/src/storm/environment/solver/SolverEnvironment.h +++ b/src/storm/environment/solver/SolverEnvironment.h @@ -14,6 +14,7 @@ namespace storm { public: SolverEnvironment(); + ~SolverEnvironment(); // EigenSolverEnvironment& eigen(); // EigenSolverEnvironment const& eigen() const;