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

Former-commit-id: f784694298

resources/3rdparty/cudd-2.5.0/CMakeLists.txt

@@ -25,5 +25,14 @@ if(MSVC)
 	add_definitions(/D_SCL_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS)
 endif()
 
+# Since we do not target Alphas, this symbol is always set
+add_definitions(-DHAVE_IEEE_754)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	message(STATUS "CUDD: Targeting 64bit architecture")
+	add_definitions(-DSIZEOF_VOID_P=8)
+	add_definitions(-DSIZEOF_LONG=8)
+endif()
+
 # Add the library
 add_library(cudd ${CUDD_SOURCES} ${CUDD_HEADERS} ${CUDD_HEADERS_CXX} ${CUDD_SOURCES_CXX})

src/parser/PrismParser.h

@@ -33,7 +33,7 @@ namespace storm {
         class GlobalProgramInformation {
         public:
             // Default construct the header information.
-            GlobalProgramInformation() = default;
+			GlobalProgramInformation() : hasInitialStatesExpression(false), currentCommandIndex(0), currentUpdateIndex(0) {}
             
             // Members for all essential information that needs to be collected.
             storm::prism::Program::ModelType modelType;