Browse Source

Fixed MSVC incompabilities

Former-commit-id: 67749daab8
tempestpy_adaptions
dbohlender 11 years ago
parent
commit
7ea7ce93e2
  1. 4
      src/storage/dd/CuddDd.cpp
  2. 11
      src/storage/dd/CuddDd.h
  3. 2
      src/storage/dd/CuddDdManager.cpp
  4. 13
      src/storage/dd/CuddDdManager.h
  5. 2
      src/storage/dd/DdMetaVariable.cpp
  6. 13
      src/storage/dd/DdMetaVariable.h

4
src/storage/dd/CuddDd.cpp

@ -1,3 +1,5 @@
#include <algorithm>
#include "src/storage/dd/CuddDd.h"
#include "src/storage/dd/CuddDdManager.h"
@ -5,7 +7,7 @@
namespace storm {
namespace dd {
Dd<CUDD>::Dd(std::shared_ptr<DdManager<CUDD>> ddManager, ADD cuddAdd, std::set<std::string> const& containedMetaVariableNames) noexcept : ddManager(ddManager), cuddAdd(cuddAdd), containedMetaVariableNames(containedMetaVariableNames) {
Dd<CUDD>::Dd(std::shared_ptr<DdManager<CUDD>> ddManager, ADD cuddAdd, std::set<std::string> const& containedMetaVariableNames) : ddManager(ddManager), cuddAdd(cuddAdd), containedMetaVariableNames(containedMetaVariableNames) {
// Intentionally left empty.
}

11
src/storage/dd/CuddDd.h

@ -6,6 +6,7 @@
#include <memory>
#include "src/storage/dd/Dd.h"
#include "utility\OsDetection.h"
// Include the C++-interface of CUDD.
#include "cuddObj.hh"
@ -24,9 +25,11 @@ namespace storm {
// Instantiate all copy/move constructors/assignments with the default implementation.
Dd() = default;
Dd(Dd<CUDD> const& other) = default;
Dd(Dd<CUDD>&& other) = default;
Dd& operator=(Dd<CUDD> const& other) = default;
Dd& operator=(Dd<CUDD>&& other) = default;
Dd& operator=(Dd<CUDD> const& other) = default;
#ifndef WINDOWS
Dd(Dd<CUDD>&& other) = default;
Dd& operator=(Dd<CUDD>&& other) = default;
#endif
/*!
* Retrieves whether the two DDs represent the same function.
@ -387,7 +390,7 @@ namespace storm {
* @param cuddAdd The CUDD ADD to store.
* @param
*/
Dd(std::shared_ptr<DdManager<CUDD>> ddManager, ADD cuddAdd, std::set<std::string> const& containedMetaVariableNames) noexcept;
Dd(std::shared_ptr<DdManager<CUDD>> ddManager, ADD cuddAdd, std::set<std::string> const& containedMetaVariableNames);
// A pointer to the manager responsible for this DD.
std::shared_ptr<DdManager<CUDD>> ddManager;

2
src/storage/dd/CuddDdManager.cpp

@ -5,7 +5,7 @@
namespace storm {
namespace dd {
DdManager<CUDD>::DdManager() noexcept : metaVariableMap(), cuddManager() {
DdManager<CUDD>::DdManager() : metaVariableMap(), cuddManager() {
// Intentionally left empty.
}

13
src/storage/dd/CuddDdManager.h

@ -6,6 +6,7 @@
#include "src/storage/dd/DdManager.h"
#include "src/storage/dd/DdMetaVariable.h"
#include "src/storage/dd/CuddDd.h"
#include "utility\OsDetection.h"
// Include the C++-interface of CUDD.
#include "cuddObj.hh"
@ -21,13 +22,17 @@ namespace storm {
/*!
* Creates an empty manager without any meta variables.
*/
DdManager() noexcept;
DdManager();
// Explictly forbid copying a DdManager, but allow moving it.
DdManager(DdManager<CUDD> const& other) = delete;
DdManager(DdManager<CUDD>&& other) = default;
DdManager<CUDD>& operator=(DdManager<CUDD> const& other) = delete;
DdManager<CUDD>& operator=(DdManager<CUDD>&& other) = default;
DdManager<CUDD>& operator=(DdManager<CUDD> const& other) = delete;
#ifndef WINDOWS
DdManager(DdManager<CUDD>&& other) = default;
DdManager<CUDD>& operator=(DdManager<CUDD>&& other) = default;
#endif
/*!
* Retrieves a DD representing the constant one function.

2
src/storage/dd/DdMetaVariable.cpp

@ -4,7 +4,7 @@
namespace storm {
namespace dd {
template<DdType Type>
DdMetaVariable<Type>::DdMetaVariable(std::string const& name, int_fast64_t low, int_fast64_t high, std::vector<Dd<Type>> const& ddVariables, std::shared_ptr<DdManager<Type>> manager) noexcept : name(name), low(low), high(high), ddVariables(ddVariables), cube(manager->getOne()), manager(manager) {
DdMetaVariable<Type>::DdMetaVariable(std::string const& name, int_fast64_t low, int_fast64_t high, std::vector<Dd<Type>> const& ddVariables, std::shared_ptr<DdManager<Type>> manager) : name(name), low(low), high(high), ddVariables(ddVariables), cube(manager->getOne()), manager(manager) {
// Create the cube of all variables of this meta variable.
for (auto const& ddVariable : this->ddVariables) {
this->cube *= ddVariable;

13
src/storage/dd/DdMetaVariable.h

@ -6,6 +6,7 @@
#include <cstdint>
#include <string>
#include "utility\OsDetection.h"
#include "src/storage/dd/CuddDd.h"
namespace storm {
@ -29,13 +30,17 @@ namespace storm {
* @param ddVariables The vector of variables used to encode this variable.
* @param manager A pointer to the manager that is responsible for this meta variable.
*/
DdMetaVariable(std::string const& name, int_fast64_t low, int_fast64_t high, std::vector<Dd<Type>> const& ddVariables, std::shared_ptr<DdManager<Type>> manager) noexcept;
DdMetaVariable(std::string const& name, int_fast64_t low, int_fast64_t high, std::vector<Dd<Type>> const& ddVariables, std::shared_ptr<DdManager<Type>> manager);
// Explictly generate all default versions of copy/move constructors/assignments.
DdMetaVariable(DdMetaVariable const& other) = default;
DdMetaVariable(DdMetaVariable&& other) = default;
DdMetaVariable& operator=(DdMetaVariable const& other) = default;
DdMetaVariable& operator=(DdMetaVariable&& other) = default;
DdMetaVariable& operator=(DdMetaVariable const& other) = default;
#ifndef WINDOWS
DdMetaVariable(DdMetaVariable&& other) = default;
DdMetaVariable& operator=(DdMetaVariable&& other) = default;
#endif
/*!
* Retrieves the name of the meta variable.

Loading…
Cancel
Save