Merge branch 'master' into storageRefactoring

Former-commit-id: 7ae25e7ab2

src/modelchecker/prctl/SparseMdpPrctlModelChecker.h

@@ -38,10 +38,14 @@ namespace storm {
                  *
                  * @param model The MDP to be checked.
                  */
-                explicit SparseMdpPrctlModelChecker(storm::models::Mdp<Type> const& model, std::shared_ptr<storm::solver::AbstractNondeterministicLinearEquationSolver<Type>> nondeterministicLinearEquationSolver = storm::utility::solver::getNondeterministicLinearEquationSolver<Type>()) : AbstractModelChecker<Type>(model), minimumOperatorStack(), nondeterministicLinearEquationSolver(nondeterministicLinearEquationSolver) {
+				explicit SparseMdpPrctlModelChecker(storm::models::Mdp<Type> const& model) : AbstractModelChecker<Type>(model), minimumOperatorStack(), nondeterministicLinearEquationSolver(storm::utility::solver::getNondeterministicLinearEquationSolver<Type>()) {
                     // Intentionally left empty.
                 }
                 
+				explicit SparseMdpPrctlModelChecker(storm::models::Mdp<Type> const& model, std::shared_ptr<storm::solver::AbstractNondeterministicLinearEquationSolver<Type>> nondeterministicLinearEquationSolver) : AbstractModelChecker<Type>(model), minimumOperatorStack(), nondeterministicLinearEquationSolver(nondeterministicLinearEquationSolver) {
+					// Intentionally left empty.
+				}
+
                 /*!
                  * Copy constructs a SparseMdpPrctlModelChecker from the given model checker. In particular, this means that the newly
                  * constructed model checker will have the model of the given model checker as its associated model.

src/models/AtomicPropositionsLabeling.h

@@ -14,6 +14,7 @@
 #include <ostream>
 #include <stdexcept>
 #include <set>
+#include <map>
 
 #include "src/utility/Hash.h"
 

src/storage/VectorSet.h

@@ -8,6 +8,7 @@
 #ifndef STORM_STORAGE_VECTORSET_H
 #define STORM_STORAGE_VECTORSET_H
 
+#include <cstdint>
 #include <set>
 #include <algorithm>
 #include <iostream>