From 9e506f40bc7a848d3f78e5a45055722c4b76b3d4 Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Mon, 26 May 2014 13:29:40 +0200
Subject: [PATCH] Some fixes for MSVC. :P
Former-commit-id: 1429e54f73dea59096796d35d511a48310759987
---
src/storage/dd/CuddDd.cpp | 2 +-
src/storage/dd/CuddDdForwardIterator.cpp | 2 +-
src/storage/dd/CuddDdMetaVariable.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/storage/dd/CuddDd.cpp b/src/storage/dd/CuddDd.cpp
index cdff92894..96bdc9e77 100644
--- a/src/storage/dd/CuddDd.cpp
+++ b/src/storage/dd/CuddDd.cpp
@@ -477,7 +477,7 @@ namespace storm {
int* cube;
double value;
DdGen* generator = this->getCuddAdd().FirstCube(&cube, &value);
- return DdForwardIterator<DdType::CUDD>(this->getDdManager(), generator, cube, value, Cudd_IsGenEmpty(generator), &this->getContainedMetaVariableNames(), enumerateDontCareMetaVariables);
+ return DdForwardIterator<DdType::CUDD>(this->getDdManager(), generator, cube, value, static_cast<bool>(Cudd_IsGenEmpty(generator)), &this->getContainedMetaVariableNames(), enumerateDontCareMetaVariables);
}
DdForwardIterator<DdType::CUDD> Dd<DdType::CUDD>::end(bool enumerateDontCareMetaVariables) const {
diff --git a/src/storage/dd/CuddDdForwardIterator.cpp b/src/storage/dd/CuddDdForwardIterator.cpp
index cce5c112c..4eda09907 100644
--- a/src/storage/dd/CuddDdForwardIterator.cpp
+++ b/src/storage/dd/CuddDdForwardIterator.cpp
@@ -70,7 +70,7 @@ namespace storm {
if (this->relevantDontCareDdVariables.empty() || this->cubeCounter >= std::pow(2, this->relevantDontCareDdVariables.size()) - 1) {
// Get the next cube and check for emptiness.
ABDD::NextCube(generator, &cube, &value);
- this->isAtEnd = Cudd_IsGenEmpty(generator);
+ this->isAtEnd = static_cast<bool>(Cudd_IsGenEmpty(generator));
// In case we are not done yet, we get ready to treat the next cube.
if (!this->isAtEnd) {
diff --git a/src/storage/dd/CuddDdMetaVariable.cpp b/src/storage/dd/CuddDdMetaVariable.cpp
index b7f45dbe3..303cb192c 100644
--- a/src/storage/dd/CuddDdMetaVariable.cpp
+++ b/src/storage/dd/CuddDdMetaVariable.cpp
@@ -21,7 +21,7 @@ namespace storm {
return this->name;
}
- typename DdMetaVariable<DdType::CUDD>::MetaVariableType DdMetaVariable<DdType::CUDD>::getType() const {
+ DdMetaVariable<DdType::CUDD>::MetaVariableType DdMetaVariable<DdType::CUDD>::getType() const {
return this->type;
}