Merge branch 'future' into gspn

Former-commit-id: 815a30b83e

resources/3rdparty/include_xerces.cmake

@@ -31,6 +31,6 @@ if(USE_XERCES)
         FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation )
         FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices )
     endif()
-    find_package(curl)
+    find_package(CURL)
     list(APPEND STORM_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${CURL_LIBRARIES})
 endif(USE_XERCES)

src/generator/NextStateGenerator.cpp

@@ -12,8 +12,6 @@
 #include "src/utility/macros.h"
 #include "src/exceptions/InvalidSettingsException.h"
 
-#define BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT
-
 namespace storm {
     namespace generator {
         
@@ -30,7 +28,7 @@ namespace storm {
         }
         
         std::string const& LabelOrExpression::getLabel() const {
-            return boost::get<std::string const&>(labelOrExpression);
+            return boost::get<std::string>(labelOrExpression);
         }
         
         bool LabelOrExpression::isExpression() const {
@@ -38,7 +36,7 @@ namespace storm {
         }
         
         storm::expressions::Expression const& LabelOrExpression::getExpression() const {
-            return boost::get<storm::expressions::Expression const&>(labelOrExpression);
+            return boost::get<storm::expressions::Expression>(labelOrExpression);
         }
         
         NextStateGeneratorOptions::NextStateGeneratorOptions(bool buildAllRewardModels, bool buildAllLabels) : buildAllRewardModels(buildAllRewardModels), buildAllLabels(buildAllLabels), buildChoiceLabels(false) {

src/generator/NextStateGenerator.h

@@ -4,11 +4,8 @@
 #include <vector>
 #include <cstdint>
 
-
 #include <boost/variant.hpp>
 
-#define BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT
-
 #include "src/storage/expressions/Expression.h"
 #include "src/storage/BitVectorHashMap.h"
 #include "src/storage/expressions/ExpressionEvaluator.h"