From 7521be74082277406aa98b4c0453cd4539ef89ba Mon Sep 17 00:00:00 2001
From: David_Korzeniewski <david.korzeniewski@rwth-aachen.de>
Date: Tue, 11 Aug 2015 20:41:15 +0200
Subject: [PATCH] Fixed some problems on windows.
Former-commit-id: 0fe6f3593dc836db99050e4cfb3ab0ecab3b2a35
---
resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt | 2 +-
src/modelchecker/results/ExplicitQualitativeCheckResult.cpp | 4 +++-
src/parser/ExpressionParser.cpp | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt b/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
index a70f5c5d2..9badb447f 100644
--- a/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
+++ b/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt
@@ -77,7 +77,7 @@ endif (WIN32)
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-else(CLANG)
+elseif(CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
endif()
diff --git a/src/modelchecker/results/ExplicitQualitativeCheckResult.cpp b/src/modelchecker/results/ExplicitQualitativeCheckResult.cpp
index 121721846..aa86846fa 100644
--- a/src/modelchecker/results/ExplicitQualitativeCheckResult.cpp
+++ b/src/modelchecker/results/ExplicitQualitativeCheckResult.cpp
@@ -40,7 +40,9 @@ namespace storm {
boost::get<vector_type>(first.truthValues) |= boost::get<vector_type>(secondCheckResult.truthValues);
}
} else {
- std::function<bool (bool, bool)> function = logicalAnd ? [] (bool a, bool b) { return a && b; } : [] (bool a, bool b) { return a || b; };
+ std::function<bool (bool, bool)> function = logicalAnd ?
+ std::function<bool(bool, bool)>([] (bool a, bool b) { return a && b; }) :
+ std::function<bool(bool, bool)>([] (bool a, bool b) { return a || b; });
map_type& map1 = boost::get<map_type>(first.truthValues);
map_type const& map2 = boost::get<map_type>(secondCheckResult.truthValues);
diff --git a/src/parser/ExpressionParser.cpp b/src/parser/ExpressionParser.cpp
index 507753a71..5a933a998 100644
--- a/src/parser/ExpressionParser.cpp
+++ b/src/parser/ExpressionParser.cpp
@@ -23,7 +23,7 @@ namespace storm {
}
minMaxExpression.name("min/max expression");
- identifierExpression = identifier[qi::_val = phoenix::bind(&ExpressionParser::getIdentifierExpression, phoenix::ref(*this), qi::_1, allowBacktracking, phoenix::ref(qi::_pass))];
+ identifierExpression = identifier[qi::_val = phoenix::bind(&ExpressionParser::getIdentifierExpression, phoenix::ref(*this), qi::_1, allowBacktracking, qi::_pass)];
identifierExpression.name("identifier expression");
literalExpression = trueFalse_[qi::_val = qi::_1] | strict_double[qi::_val = phoenix::bind(&ExpressionParser::createDoubleLiteralExpression, phoenix::ref(*this), qi::_1, qi::_pass)] | qi::int_[qi::_val = phoenix::bind(&ExpressionParser::createIntegerLiteralExpression, phoenix::ref(*this), qi::_1)];