Merge branch 'master' into future

Former-commit-id: 1a3d651953

src/modelchecker/results/CheckResult.h

@@ -21,6 +21,8 @@ namespace storm {
         // The base class of all check results.
         class CheckResult {
         public:
+            virtual ~CheckResult() = default;
+            
             /*!
              * Filters the current result wrt. to the filter, i.e. only keeps the entries that are selected by the filter.
              * This means that the filter must be a qualitative result of proper type (symbolic/explicit).

src/modelchecker/results/ExplicitQualitativeCheckResult.h

@@ -18,6 +18,7 @@ namespace storm {
             typedef std::map<storm::storage::sparse::state_type, bool> map_type;
             
             ExplicitQualitativeCheckResult();
+            virtual ~ExplicitQualitativeCheckResult() = default;
             ExplicitQualitativeCheckResult(map_type const& map);
             ExplicitQualitativeCheckResult(map_type&& map);
             ExplicitQualitativeCheckResult(storm::storage::sparse::state_type state, bool value);

src/modelchecker/results/ExplicitQuantitativeCheckResult.h

@@ -30,6 +30,7 @@ namespace storm {
             ExplicitQuantitativeCheckResult(ExplicitQuantitativeCheckResult&& other) = default;
             ExplicitQuantitativeCheckResult& operator=(ExplicitQuantitativeCheckResult&& other) = default;
 #endif
+            virtual ~ExplicitQuantitativeCheckResult() = default;
             
             ValueType& operator[](storm::storage::sparse::state_type state);
             ValueType const& operator[](storm::storage::sparse::state_type state) const;

src/modelchecker/results/QualitativeCheckResult.h

@@ -7,6 +7,7 @@ namespace storm {
     namespace modelchecker {
         class QualitativeCheckResult : public CheckResult {
         public:
+            virtual ~QualitativeCheckResult() = default;
             virtual QualitativeCheckResult& operator&=(QualitativeCheckResult const& other);
             virtual QualitativeCheckResult& operator|=(QualitativeCheckResult const& other);
             virtual void complement();

src/modelchecker/results/QuantitativeCheckResult.h

@@ -7,6 +7,9 @@ namespace storm {
     namespace modelchecker {
         class QuantitativeCheckResult : public CheckResult {
         public:
+            
+            virtual ~QuantitativeCheckResult() = default;
+            
             virtual std::unique_ptr<CheckResult> compareAgainstBound(storm::logic::ComparisonType comparisonType, double bound) const;
             
             virtual bool isQuantitative() const override;

src/utility/ConstantsComparator.cpp

@@ -12,12 +12,12 @@ namespace storm {
     namespace utility {
         template<typename ValueType>
         bool ConstantsComparator<ValueType>::isOne(ValueType const& value) const {
-            return isOne(value);
+            return storm::utility::isOne(value);
         }
         
         template<typename ValueType>
         bool ConstantsComparator<ValueType>::isZero(ValueType const& value) const {
-            return isZero(value);
+            return storm::utility::isZero(value);
         }
         
         template<typename ValueType>
@@ -27,7 +27,7 @@ namespace storm {
         
         template<typename ValueType>
         bool ConstantsComparator<ValueType>::isConstant(ValueType const& value) const {
-            return isConstant(value);
+            return storm::utility::isConstant(value);
         }
 
         template<typename ValueType>