Browse Source

Some fixes for MSVC. :P

Former-commit-id: 1429e54f73
tempestpy_adaptions
dehnert 11 years ago
parent
commit
9e506f40bc
  1. 2
      src/storage/dd/CuddDd.cpp
  2. 2
      src/storage/dd/CuddDdForwardIterator.cpp
  3. 2
      src/storage/dd/CuddDdMetaVariable.cpp

2
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 {

2
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) {

2
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;
}

Loading…
Cancel
Save