From 0a501b6e76208c82c177b2296718873a97e3d10c Mon Sep 17 00:00:00 2001
From: PBerger <philipp.berger@rwth-aachen.de>
Date: Fri, 18 Apr 2014 13:48:17 +0200
Subject: [PATCH 1/2] Added a constructor for GlobalProgramInformation as MSVC
fails to default bool to false.
Former-commit-id: bd50a770c8341b19d60549545775d96dd13d1795
---
src/parser/PrismParser.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/parser/PrismParser.h b/src/parser/PrismParser.h
index 98053890a..15acef30b 100644
--- a/src/parser/PrismParser.h
+++ b/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;
From f2383ccfb563ac4cc6a84c3a258e0c6adfea8033 Mon Sep 17 00:00:00 2001
From: PBerger <philipp.berger@rwth-aachen.de>
Date: Fri, 18 Apr 2014 21:16:02 +0200
Subject: [PATCH 2/2] Added missing definitions required for CUDD to compile
under 64bit architectures.
Former-commit-id: 4e40ea7ee36e6732b2a5218e73a910de217d1671
---
resources/3rdparty/cudd-2.5.0/CMakeLists.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/resources/3rdparty/cudd-2.5.0/CMakeLists.txt b/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
index c7cff2aca..4d08513de 100644
--- a/resources/3rdparty/cudd-2.5.0/CMakeLists.txt
+++ b/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})
\ No newline at end of file