Merge branch 'master' of https://sselab.de/lab9/private/git/storm

Former-commit-id: ad5e99369b

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()
 

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);

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)];