From cc958bedf06e074565d5a5a960a680af07ab5fe5 Mon Sep 17 00:00:00 2001 From: dehnert Date: Sun, 31 Jul 2016 11:47:43 +0200 Subject: [PATCH 1/3] fixed wrong usage of boost::variant in NextStateGenerator Former-commit-id: 0ba0e8d565a36aef6921ee722c1868477db9511e --- src/generator/NextStateGenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generator/NextStateGenerator.cpp b/src/generator/NextStateGenerator.cpp index f7cacafc2..4d2776386 100644 --- a/src/generator/NextStateGenerator.cpp +++ b/src/generator/NextStateGenerator.cpp @@ -30,7 +30,7 @@ namespace storm { } std::string const& LabelOrExpression::getLabel() const { - return boost::get(labelOrExpression); + return boost::get(labelOrExpression); } bool LabelOrExpression::isExpression() const { @@ -38,7 +38,7 @@ namespace storm { } storm::expressions::Expression const& LabelOrExpression::getExpression() const { - return boost::get(labelOrExpression); + return boost::get(labelOrExpression); } NextStateGeneratorOptions::NextStateGeneratorOptions(bool buildAllRewardModels, bool buildAllLabels) : buildAllRewardModels(buildAllRewardModels), buildAllLabels(buildAllLabels), buildChoiceLabels(false) { From 510e52527453f8465701fa959f11dbdc01810470 Mon Sep 17 00:00:00 2001 From: dehnert Date: Sun, 31 Jul 2016 12:50:40 +0200 Subject: [PATCH 2/3] removed unnecessary define for boost::variant problem Former-commit-id: 9c64abbbda3e7e533c474866198fb44cc40fd08d --- src/generator/NextStateGenerator.cpp | 2 -- src/generator/NextStateGenerator.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/generator/NextStateGenerator.cpp b/src/generator/NextStateGenerator.cpp index 4d2776386..9c1eefbd5 100644 --- a/src/generator/NextStateGenerator.cpp +++ b/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 { diff --git a/src/generator/NextStateGenerator.h b/src/generator/NextStateGenerator.h index 1a49b56c1..30a4157cd 100644 --- a/src/generator/NextStateGenerator.h +++ b/src/generator/NextStateGenerator.h @@ -4,11 +4,8 @@ #include #include - #include -#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" From 221bb59af186b56730ee28934d8128decdd47ade Mon Sep 17 00:00:00 2001 From: Mavo Date: Sun, 31 Jul 2016 19:53:17 +0200 Subject: [PATCH 3/3] CURL instead of curl Former-commit-id: decafed99d891858c57bddb247f24a40e3565f8a --- resources/3rdparty/include_xerces.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/3rdparty/include_xerces.cmake b/resources/3rdparty/include_xerces.cmake index 9258f66bc..73f559cec 100644 --- a/resources/3rdparty/include_xerces.cmake +++ b/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) \ No newline at end of file +endif(USE_XERCES)