From e119131f78194b89a0fb69dbc959b202cdd59461 Mon Sep 17 00:00:00 2001
From: TimQu <tim.quatmann@cs.rwth-aachen.de>
Date: Fri, 14 Sep 2018 16:34:37 +0200
Subject: [PATCH] storm-conv compiles

---
 src/storm-conv-cli/storm-conv.cpp | 4 +++-
 src/storm-conv/api/storm-conv.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/storm-conv-cli/storm-conv.cpp b/src/storm-conv-cli/storm-conv.cpp
index 72cba3e3d..043b27bb9 100644
--- a/src/storm-conv-cli/storm-conv.cpp
+++ b/src/storm-conv-cli/storm-conv.cpp
@@ -187,7 +187,9 @@ namespace storm {
                 boost::optional<std::set<std::string>> propertyFilter = storm::api::parsePropertyFilter(input.getPropertyInputFilter());
                 properties = storm::api::parsePropertiesForSymbolicModelDescription(input.getPropertyInput(), janiModel, propertyFilter);
             } else {
-                properties.insert(properties.end(), janiModelProperties.second.begin(), janiModelProperties.second.end());
+                for (auto const& p : janiModelProperties.second) {
+                    properties.push_back(p.second);
+                }
             }
             
             // Substitute constant definitions in program and properties.
diff --git a/src/storm-conv/api/storm-conv.cpp b/src/storm-conv/api/storm-conv.cpp
index c0e7252bd..7b7f4d806 100644
--- a/src/storm-conv/api/storm-conv.cpp
+++ b/src/storm-conv/api/storm-conv.cpp
@@ -40,7 +40,7 @@ namespace storm {
             }
             
             if (!options.allowFunctions && janiModel.getModelFeatures().hasFunctions()) {
-                janiModel = janiModel.substituteFunctions(properties);
+                janiModel.substituteFunctions(properties);
             }
             
             if (options.modelName) {