Browse Source

changed some method signatures to make gcc happier

Former-commit-id: 12a6d0b4d6
main
dehnert 10 years ago
parent
commit
e2b84c8155
  1. 8
      src/models/sparse/Ctmc.h
  2. 8
      src/models/sparse/DeterministicModel.h
  3. 8
      src/models/sparse/Dtmc.h
  4. 8
      src/models/sparse/MarkovAutomaton.h
  5. 8
      src/models/sparse/Mdp.h
  6. 8
      src/models/sparse/Model.h
  7. 8
      src/models/sparse/NondeterministicModel.h

8
src/models/sparse/Ctmc.h

@ -38,12 +38,12 @@ namespace storm {
std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
Ctmc(Ctmc<ValueType> const& ctmc) = default;
Ctmc& operator=(Ctmc<ValueType> const& ctmc) = default;
Ctmc(Ctmc<ValueType, RewardModelType> const& ctmc) = default;
Ctmc& operator=(Ctmc<ValueType, RewardModelType> const& ctmc) = default;
#ifndef WINDOWS
Ctmc(Ctmc<ValueType>&& ctmc) = default;
Ctmc& operator=(Ctmc<ValueType>&& ctmc) = default;
Ctmc(Ctmc<ValueType, RewardModelType>&& ctmc) = default;
Ctmc& operator=(Ctmc<ValueType, RewardModelType>&& ctmc) = default;
#endif
/*!
* Retrieves the vector of exit rates of the model.

8
src/models/sparse/DeterministicModel.h

@ -44,12 +44,12 @@ namespace storm {
std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
DeterministicModel(DeterministicModel const& other) = default;
DeterministicModel& operator=(DeterministicModel const& other) = default;
DeterministicModel(DeterministicModel<ValueType, RewardModelType> const& other) = default;
DeterministicModel& operator=(DeterministicModel<ValueType, RewardModelType> const& other) = default;
#ifndef WINDOWS
DeterministicModel(DeterministicModel&& other) = default;
DeterministicModel<ValueType>& operator=(DeterministicModel<ValueType>&& model) = default;
DeterministicModel(DeterministicModel<ValueType, RewardModelType>&& other) = default;
DeterministicModel<ValueType>& operator=(DeterministicModel<ValueType, RewardModelType>&& model) = default;
#endif
virtual void reduceToStateBasedRewards() override;

8
src/models/sparse/Dtmc.h

@ -42,12 +42,12 @@ namespace storm {
std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
Dtmc(Dtmc<ValueType> const& dtmc) = default;
Dtmc& operator=(Dtmc<ValueType> const& dtmc) = default;
Dtmc(Dtmc<ValueType, RewardModelType> const& dtmc) = default;
Dtmc& operator=(Dtmc<ValueType, RewardModelType> const& dtmc) = default;
#ifndef WINDOWS
Dtmc(Dtmc<ValueType>&& dtmc) = default;
Dtmc& operator=(Dtmc<ValueType>&& dtmc) = default;
Dtmc(Dtmc<ValueType, RewardModelType>&& dtmc) = default;
Dtmc& operator=(Dtmc<ValueType, RewardModelType>&& dtmc) = default;
#endif
/*!

8
src/models/sparse/MarkovAutomaton.h

@ -48,12 +48,12 @@ namespace storm {
std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
MarkovAutomaton(MarkovAutomaton const& other) = default;
MarkovAutomaton& operator=(MarkovAutomaton const& other) = default;
MarkovAutomaton(MarkovAutomaton<ValueType, RewardModelType> const& other) = default;
MarkovAutomaton& operator=(MarkovAutomaton<ValueType, RewardModelType> const& other) = default;
#ifndef WINDOWS
MarkovAutomaton(MarkovAutomaton&& other) = default;
MarkovAutomaton& operator=(MarkovAutomaton&& other) = default;
MarkovAutomaton(MarkovAutomaton<ValueType, RewardModelType>&& other) = default;
MarkovAutomaton& operator=(MarkovAutomaton<ValueType, RewardModelType>&& other) = default;
#endif
/*!

8
src/models/sparse/Mdp.h

@ -40,12 +40,12 @@ namespace storm {
std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
Mdp(Mdp const& other) = default;
Mdp& operator=(Mdp const& other) = default;
Mdp(Mdp<ValueType, RewardModelType> const& other) = default;
Mdp& operator=(Mdp<ValueType, RewardModelType> const& other) = default;
#ifndef WINDOWS
Mdp(Mdp&& other) = default;
Mdp& operator=(Mdp&& other) = default;
Mdp(Mdp<ValueType, RewardModelType>&& other) = default;
Mdp& operator=(Mdp<ValueType, RewardModelType>&& other) = default;
#endif
/*!

8
src/models/sparse/Model.h

@ -32,12 +32,12 @@ namespace storm {
typedef CValueType ValueType;
typedef CRewardModelType RewardModelType;
Model(Model<ValueType> const& other) = default;
Model& operator=(Model<ValueType> const& other) = default;
Model(Model<ValueType, RewardModelType> const& other) = default;
Model& operator=(Model<ValueType, RewardModelType> const& other) = default;
#ifndef WINDOWS
Model(Model<ValueType>&& other) = default;
Model& operator=(Model<ValueType>&& other) = default;
Model(Model<ValueType, RewardModelType>&& other) = default;
Model& operator=(Model<ValueType, RewardModelType>&& other) = default;
#endif
/*!

8
src/models/sparse/NondeterministicModel.h

@ -44,12 +44,12 @@ namespace storm {
std::unordered_map<std::string, RewardModelType>&& rewardModels = std::unordered_map<std::string, RewardModelType>(),
boost::optional<std::vector<LabelSet>>&& optionalChoiceLabeling = boost::optional<std::vector<LabelSet>>());
NondeterministicModel(NondeterministicModel const& other) = default;
NondeterministicModel& operator=(NondeterministicModel const& other) = default;
NondeterministicModel(NondeterministicModel<ValueType, RewardModelType> const& other) = default;
NondeterministicModel& operator=(NondeterministicModel<ValueType, RewardModelType> const& other) = default;
#ifndef WINDOWS
NondeterministicModel(NondeterministicModel&& other) = default;
NondeterministicModel& operator=(NondeterministicModel&& other) = default;
NondeterministicModel(NondeterministicModel<ValueType, RewardModelType>&& other) = default;
NondeterministicModel& operator=(NondeterministicModel<ValueType, RewardModelType>&& other) = default;
#endif
/*!

Loading…
Cancel
Save