Merge remote-tracking branch 'upstream/master'

src/storm/api/builder.h

@@ -116,7 +116,7 @@ namespace storm {
         }
         
         template<typename ValueType>
-        std::shared_ptr<storm::models::sparse::Model<ValueType>> buildExplicitModel(std::string const&, std::string const&, boost::optional<std::string> const& = boost::none, boost::optional<std::string> const& = boost::none, boost::optional<std::string> const& = boost::none) {
+        std::shared_ptr<storm::models::sparse::Model<ValueType>> buildExplicitModel(std::string const& transitionsFile, std::string const& labelingFile, boost::optional<std::string> const& stateRewardsFile = boost::none, boost::optional<std::string> const& transitionRewardsFile = boost::none, boost::optional<std::string> const& choiceLabelingFile = boost::none) {
             STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Exact or parametric models with explicit input are not supported.");
         }
         

src/storm/api/properties.h

@@ -4,6 +4,7 @@
 #include <set>
 #include <map>
 #include <vector>
+#include <memory>
 #include <boost/optional.hpp>
 
 namespace storm {