From 586929ea64b07ace50674353722cbec33ac58f61 Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Mon, 24 Apr 2017 13:27:19 +0200 Subject: [PATCH] As we do not support windows, we can also get rid of: #ifndef WINDOWS especially since the guards were around move-constructors, which are supported under Windows since Visual Studio 2015 --- src/storm/models/sparse/Ctmc.h | 4 +--- src/storm/models/sparse/DeterministicModel.h | 5 ++--- src/storm/models/sparse/Dtmc.h | 4 +--- src/storm/models/sparse/MarkovAutomaton.h | 4 +--- src/storm/models/sparse/Mdp.h | 4 +--- src/storm/models/sparse/Model.h | 6 +----- src/storm/models/sparse/NondeterministicModel.h | 4 +--- src/storm/models/sparse/StandardRewardModel.h | 4 +--- src/storm/models/sparse/StochasticTwoPlayerGame.h | 4 +--- src/storm/storage/expressions/BaseExpression.h | 4 +--- .../storage/expressions/BinaryBooleanFunctionExpression.h | 3 +-- src/storm/storage/expressions/BinaryExpression.h | 3 +-- .../storage/expressions/BinaryNumericalFunctionExpression.h | 3 +-- src/storm/storage/expressions/BinaryRelationExpression.h | 3 +-- src/storm/storage/expressions/BooleanLiteralExpression.h | 3 +-- src/storm/storage/expressions/Expression.h | 4 +--- src/storm/storage/expressions/IfThenElseExpression.h | 3 +-- src/storm/storage/expressions/IntegerLiteralExpression.h | 3 +-- src/storm/storage/expressions/LinearCoefficientVisitor.h | 4 +--- src/storm/storage/expressions/RationalLiteralExpression.h | 3 +-- .../storage/expressions/UnaryBooleanFunctionExpression.h | 2 -- src/storm/storage/expressions/UnaryExpression.h | 2 -- .../storage/expressions/UnaryNumericalFunctionExpression.h | 3 +-- src/storm/storage/expressions/Variable.h | 3 +-- src/storm/storage/expressions/VariableExpression.h | 3 +-- src/storm/storage/prism/Assignment.h | 4 +--- src/storm/storage/prism/BooleanVariable.h | 2 -- src/storm/storage/prism/Command.h | 4 +--- src/storm/storage/prism/Constant.h | 4 +--- src/storm/storage/prism/Formula.h | 4 +--- src/storm/storage/prism/InitialConstruct.h | 4 +--- src/storm/storage/prism/IntegerVariable.h | 2 -- src/storm/storage/prism/Label.h | 4 +--- src/storm/storage/prism/LocatedInformation.h | 4 +--- src/storm/storage/prism/Module.h | 4 +--- src/storm/storage/prism/Program.h | 4 +--- src/storm/storage/prism/RewardModel.h | 4 +--- src/storm/storage/prism/StateActionReward.h | 4 +--- src/storm/storage/prism/StateReward.h | 4 +--- src/storm/storage/prism/SystemCompositionConstruct.h | 4 +--- src/storm/storage/prism/TransitionReward.h | 4 +--- src/storm/storage/prism/Update.h | 4 +--- src/storm/storage/prism/Variable.h | 4 +--- 43 files changed, 40 insertions(+), 116 deletions(-) diff --git a/src/storm/models/sparse/Ctmc.h b/src/storm/models/sparse/Ctmc.h index 8bb1f37ed..3bf6dc78c 100644 --- a/src/storm/models/sparse/Ctmc.h +++ b/src/storm/models/sparse/Ctmc.h @@ -54,11 +54,9 @@ namespace storm { Ctmc(Ctmc const& ctmc) = default; Ctmc& operator=(Ctmc const& ctmc) = default; - -#ifndef WINDOWS Ctmc(Ctmc&& ctmc) = default; Ctmc& operator=(Ctmc&& ctmc) = default; -#endif + /*! * Retrieves the vector of exit rates of the model. * diff --git a/src/storm/models/sparse/DeterministicModel.h b/src/storm/models/sparse/DeterministicModel.h index a7a2503de..c823b91cf 100644 --- a/src/storm/models/sparse/DeterministicModel.h +++ b/src/storm/models/sparse/DeterministicModel.h @@ -47,11 +47,10 @@ namespace storm { DeterministicModel(DeterministicModel const& other) = default; DeterministicModel& operator=(DeterministicModel const& other) = default; -#ifndef WINDOWS + DeterministicModel(DeterministicModel&& other) = default; DeterministicModel& operator=(DeterministicModel&& model) = default; -#endif - + virtual void reduceToStateBasedRewards() override; virtual void writeDotToStream(std::ostream& outStream, bool includeLabeling = true, storm::storage::BitVector const* subsystem = nullptr, std::vector const* firstValue = nullptr, std::vector const* secondValue = nullptr, std::vector const* stateColoring = nullptr, std::vector const* colors = nullptr, std::vector* scheduler = nullptr, bool finalizeOutput = true) const override; diff --git a/src/storm/models/sparse/Dtmc.h b/src/storm/models/sparse/Dtmc.h index c5b4a4420..25002856c 100644 --- a/src/storm/models/sparse/Dtmc.h +++ b/src/storm/models/sparse/Dtmc.h @@ -44,11 +44,9 @@ namespace storm { Dtmc(Dtmc const& dtmc) = default; Dtmc& operator=(Dtmc const& dtmc) = default; -#ifndef WINDOWS Dtmc(Dtmc&& dtmc) = default; Dtmc& operator=(Dtmc&& dtmc) = default; -#endif - + #ifdef STORM_HAVE_CARL class ConstraintCollector { diff --git a/src/storm/models/sparse/MarkovAutomaton.h b/src/storm/models/sparse/MarkovAutomaton.h index 477d0ee5f..5e1cb7862 100644 --- a/src/storm/models/sparse/MarkovAutomaton.h +++ b/src/storm/models/sparse/MarkovAutomaton.h @@ -107,11 +107,9 @@ namespace storm { MarkovAutomaton(MarkovAutomaton const& other) = default; MarkovAutomaton& operator=(MarkovAutomaton const& other) = default; -#ifndef WINDOWS MarkovAutomaton(MarkovAutomaton&& other) = default; MarkovAutomaton& operator=(MarkovAutomaton&& other) = default; -#endif - + /*! * Retrieves whether the Markov automaton is closed. * diff --git a/src/storm/models/sparse/Mdp.h b/src/storm/models/sparse/Mdp.h index 5651d5dc9..ba231cd72 100644 --- a/src/storm/models/sparse/Mdp.h +++ b/src/storm/models/sparse/Mdp.h @@ -44,11 +44,9 @@ namespace storm { Mdp(Mdp const& other) = default; Mdp& operator=(Mdp const& other) = default; -#ifndef WINDOWS Mdp(Mdp&& other) = default; Mdp& operator=(Mdp&& other) = default; -#endif - + /*! * Constructs an MDP by copying the current MDP and restricting the choices of each state to the ones * whose label set is contained in the given label set. Note that is is only valid to call this method diff --git a/src/storm/models/sparse/Model.h b/src/storm/models/sparse/Model.h index a545ae3ce..206b364b7 100644 --- a/src/storm/models/sparse/Model.h +++ b/src/storm/models/sparse/Model.h @@ -46,11 +46,7 @@ namespace storm { Model(Model const& other) = default; Model& operator=(Model const& other) = default; -#ifndef WINDOWS - Model(Model&& other) = default; - Model& operator=(Model&& other) = default; -#endif - + /*! * Constructs a model from the given data. * diff --git a/src/storm/models/sparse/NondeterministicModel.h b/src/storm/models/sparse/NondeterministicModel.h index 8d0960aa5..b0f32e688 100644 --- a/src/storm/models/sparse/NondeterministicModel.h +++ b/src/storm/models/sparse/NondeterministicModel.h @@ -47,11 +47,9 @@ namespace storm { NondeterministicModel(NondeterministicModel const& other) = default; NondeterministicModel& operator=(NondeterministicModel const& other) = default; -#ifndef WINDOWS NondeterministicModel(NondeterministicModel&& other) = default; NondeterministicModel& operator=(NondeterministicModel&& other) = default; -#endif - + /*! * Retrieves the number of (nondeterministic) choices in the model. * diff --git a/src/storm/models/sparse/StandardRewardModel.h b/src/storm/models/sparse/StandardRewardModel.h index e98430d64..57b0d5c5a 100644 --- a/src/storm/models/sparse/StandardRewardModel.h +++ b/src/storm/models/sparse/StandardRewardModel.h @@ -40,11 +40,9 @@ namespace storm { StandardRewardModel(StandardRewardModel const& dtmc) = default; StandardRewardModel& operator=(StandardRewardModel const& dtmc) = default; -#ifndef WINDOWS StandardRewardModel(StandardRewardModel&& dtmc) = default; StandardRewardModel& operator=(StandardRewardModel&& dtmc) = default; -#endif - + /*! * Retrieves whether the reward model has state rewards. * diff --git a/src/storm/models/sparse/StochasticTwoPlayerGame.h b/src/storm/models/sparse/StochasticTwoPlayerGame.h index 520001e95..a589decc1 100644 --- a/src/storm/models/sparse/StochasticTwoPlayerGame.h +++ b/src/storm/models/sparse/StochasticTwoPlayerGame.h @@ -52,11 +52,9 @@ namespace storm { StochasticTwoPlayerGame(StochasticTwoPlayerGame const& other) = default; StochasticTwoPlayerGame& operator=(StochasticTwoPlayerGame const& other) = default; -#ifndef WINDOWS StochasticTwoPlayerGame(StochasticTwoPlayerGame&& other) = default; StochasticTwoPlayerGame& operator=(StochasticTwoPlayerGame&& other) = default; -#endif - + /*! * Retrieves the matrix representing the choices in player 1 states. * diff --git a/src/storm/storage/expressions/BaseExpression.h b/src/storm/storage/expressions/BaseExpression.h index 83c76f7ae..5f93766a5 100644 --- a/src/storm/storage/expressions/BaseExpression.h +++ b/src/storm/storage/expressions/BaseExpression.h @@ -48,11 +48,9 @@ namespace storm { // Create default versions of constructors and assignments. BaseExpression(BaseExpression const&) = default; BaseExpression& operator=(BaseExpression const&) = delete; -#ifndef WINDOWS BaseExpression(BaseExpression&&) = default; BaseExpression& operator=(BaseExpression&&) = delete; -#endif - + // Make the destructor virtual (to allow destruction via base class pointer) and default it. virtual ~BaseExpression() = default; diff --git a/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h index eb1344262..5de256e98 100644 --- a/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h +++ b/src/storm/storage/expressions/BinaryBooleanFunctionExpression.h @@ -27,10 +27,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. BinaryBooleanFunctionExpression(BinaryBooleanFunctionExpression const& other) = default; BinaryBooleanFunctionExpression& operator=(BinaryBooleanFunctionExpression const& other) = delete; -#ifndef WINDOWS BinaryBooleanFunctionExpression(BinaryBooleanFunctionExpression&&) = default; BinaryBooleanFunctionExpression& operator=(BinaryBooleanFunctionExpression&&) = delete; -#endif + virtual ~BinaryBooleanFunctionExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/BinaryExpression.h b/src/storm/storage/expressions/BinaryExpression.h index 2ad23e808..2a7eb10bb 100644 --- a/src/storm/storage/expressions/BinaryExpression.h +++ b/src/storm/storage/expressions/BinaryExpression.h @@ -24,10 +24,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. BinaryExpression(BinaryExpression const& other) = default; BinaryExpression& operator=(BinaryExpression const& other) = delete; -#ifndef WINDOWS BinaryExpression(BinaryExpression&&) = default; BinaryExpression& operator=(BinaryExpression&&) = delete; -#endif + virtual ~BinaryExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h index b69c3b8c5..1e9adb028 100644 --- a/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h +++ b/src/storm/storage/expressions/BinaryNumericalFunctionExpression.h @@ -27,10 +27,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. BinaryNumericalFunctionExpression(BinaryNumericalFunctionExpression const& other) = default; BinaryNumericalFunctionExpression& operator=(BinaryNumericalFunctionExpression const& other) = delete; -#ifndef WINDOWS BinaryNumericalFunctionExpression(BinaryNumericalFunctionExpression&&) = default; BinaryNumericalFunctionExpression& operator=(BinaryNumericalFunctionExpression&&) = delete; -#endif + virtual ~BinaryNumericalFunctionExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/BinaryRelationExpression.h b/src/storm/storage/expressions/BinaryRelationExpression.h index a9ed11924..b87fe55ef 100644 --- a/src/storm/storage/expressions/BinaryRelationExpression.h +++ b/src/storm/storage/expressions/BinaryRelationExpression.h @@ -27,10 +27,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. BinaryRelationExpression(BinaryRelationExpression const& other) = default; BinaryRelationExpression& operator=(BinaryRelationExpression const& other) = default; -#ifndef WINDOWS BinaryRelationExpression(BinaryRelationExpression&&) = default; BinaryRelationExpression& operator=(BinaryRelationExpression&&) = default; -#endif + virtual ~BinaryRelationExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/BooleanLiteralExpression.h b/src/storm/storage/expressions/BooleanLiteralExpression.h index b989493d0..f87246a30 100644 --- a/src/storm/storage/expressions/BooleanLiteralExpression.h +++ b/src/storm/storage/expressions/BooleanLiteralExpression.h @@ -19,10 +19,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. BooleanLiteralExpression(BooleanLiteralExpression const& other) = default; BooleanLiteralExpression& operator=(BooleanLiteralExpression const& other) = delete; -#ifndef WINDOWS BooleanLiteralExpression(BooleanLiteralExpression&&) = default; BooleanLiteralExpression& operator=(BooleanLiteralExpression&&) = delete; -#endif + virtual ~BooleanLiteralExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/Expression.h b/src/storm/storage/expressions/Expression.h index d694017a7..26d6033c6 100644 --- a/src/storm/storage/expressions/Expression.h +++ b/src/storm/storage/expressions/Expression.h @@ -76,11 +76,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. Expression(Expression const& other) = default; Expression& operator=(Expression const& other) = default; -#ifndef WINDOWS Expression(Expression&&) = default; Expression& operator=(Expression&&) = default; -#endif - + /*! * Converts the expression to an expression over the variables of the provided expression manager. */ diff --git a/src/storm/storage/expressions/IfThenElseExpression.h b/src/storm/storage/expressions/IfThenElseExpression.h index 0d1be1d4b..c52c23087 100644 --- a/src/storm/storage/expressions/IfThenElseExpression.h +++ b/src/storm/storage/expressions/IfThenElseExpression.h @@ -21,10 +21,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. IfThenElseExpression(IfThenElseExpression const& other) = default; IfThenElseExpression& operator=(IfThenElseExpression const& other) = delete; -#ifndef WINDOWS IfThenElseExpression(IfThenElseExpression&&) = default; IfThenElseExpression& operator=(IfThenElseExpression&&) = delete; -#endif + virtual ~IfThenElseExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/IntegerLiteralExpression.h b/src/storm/storage/expressions/IntegerLiteralExpression.h index 9266ea968..1a981464f 100644 --- a/src/storm/storage/expressions/IntegerLiteralExpression.h +++ b/src/storm/storage/expressions/IntegerLiteralExpression.h @@ -19,10 +19,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. IntegerLiteralExpression(IntegerLiteralExpression const& other) = default; IntegerLiteralExpression& operator=(IntegerLiteralExpression const& other) = delete; -#ifndef WINDOWS IntegerLiteralExpression(IntegerLiteralExpression&&) = default; IntegerLiteralExpression& operator=(IntegerLiteralExpression&&) = delete; -#endif + virtual ~IntegerLiteralExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/LinearCoefficientVisitor.h b/src/storm/storage/expressions/LinearCoefficientVisitor.h index c5111beab..1a6a14d30 100644 --- a/src/storm/storage/expressions/LinearCoefficientVisitor.h +++ b/src/storm/storage/expressions/LinearCoefficientVisitor.h @@ -18,11 +18,9 @@ namespace storm { VariableCoefficients(VariableCoefficients const& other) = default; VariableCoefficients& operator=(VariableCoefficients const& other) = default; -#ifndef WINDOWS VariableCoefficients(VariableCoefficients&& other) = default; VariableCoefficients& operator=(VariableCoefficients&& other) = default; -#endif - + VariableCoefficients& operator+=(VariableCoefficients&& other); VariableCoefficients& operator-=(VariableCoefficients&& other); VariableCoefficients& operator*=(VariableCoefficients&& other); diff --git a/src/storm/storage/expressions/RationalLiteralExpression.h b/src/storm/storage/expressions/RationalLiteralExpression.h index 77d8f3703..b89505471 100644 --- a/src/storm/storage/expressions/RationalLiteralExpression.h +++ b/src/storm/storage/expressions/RationalLiteralExpression.h @@ -37,10 +37,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. RationalLiteralExpression(RationalLiteralExpression const& other) = default; RationalLiteralExpression& operator=(RationalLiteralExpression const& other) = delete; -#ifndef WINDOWS RationalLiteralExpression(RationalLiteralExpression&&) = default; RationalLiteralExpression& operator=(RationalLiteralExpression&&) = delete; -#endif + virtual ~RationalLiteralExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h index 918300d93..64a185430 100644 --- a/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h +++ b/src/storm/storage/expressions/UnaryBooleanFunctionExpression.h @@ -26,10 +26,8 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. UnaryBooleanFunctionExpression(UnaryBooleanFunctionExpression const& other) = default; UnaryBooleanFunctionExpression& operator=(UnaryBooleanFunctionExpression const& other) = delete; -#ifndef WINDOWS UnaryBooleanFunctionExpression(UnaryBooleanFunctionExpression&&) = default; UnaryBooleanFunctionExpression& operator=(UnaryBooleanFunctionExpression&&) = delete; -#endif virtual ~UnaryBooleanFunctionExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/UnaryExpression.h b/src/storm/storage/expressions/UnaryExpression.h index 05f84f6c2..77b6374a6 100644 --- a/src/storm/storage/expressions/UnaryExpression.h +++ b/src/storm/storage/expressions/UnaryExpression.h @@ -20,10 +20,8 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. UnaryExpression(UnaryExpression const& other) = default; UnaryExpression& operator=(UnaryExpression const& other) = delete; -#ifndef WINDOWS UnaryExpression(UnaryExpression&&) = default; UnaryExpression& operator=(UnaryExpression&&) = delete; -#endif virtual ~UnaryExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h index fe8fbaf45..134fa34eb 100644 --- a/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h +++ b/src/storm/storage/expressions/UnaryNumericalFunctionExpression.h @@ -26,10 +26,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. UnaryNumericalFunctionExpression(UnaryNumericalFunctionExpression const& other) = default; UnaryNumericalFunctionExpression& operator=(UnaryNumericalFunctionExpression const& other) = delete; -#ifndef WINDOWS UnaryNumericalFunctionExpression(UnaryNumericalFunctionExpression&&) = default; UnaryNumericalFunctionExpression& operator=(UnaryNumericalFunctionExpression&&) = delete; -#endif + virtual ~UnaryNumericalFunctionExpression() = default; // Override base class methods. diff --git a/src/storm/storage/expressions/Variable.h b/src/storm/storage/expressions/Variable.h index f93a4dfd5..83ee9a13e 100644 --- a/src/storm/storage/expressions/Variable.h +++ b/src/storm/storage/expressions/Variable.h @@ -31,10 +31,9 @@ namespace storm { // Default-instantiate some copy/move construction/assignment. Variable(Variable const& other) = default; Variable& operator=(Variable const& other) = default; -#ifndef WINDOWS Variable(Variable&& other) = default; Variable& operator=(Variable&& other) = default; -#endif + /*! * Checks the two variables for equality. diff --git a/src/storm/storage/expressions/VariableExpression.h b/src/storm/storage/expressions/VariableExpression.h index 708ec35fc..f7d92ab52 100644 --- a/src/storm/storage/expressions/VariableExpression.h +++ b/src/storm/storage/expressions/VariableExpression.h @@ -20,10 +20,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. VariableExpression(VariableExpression const&) = default; VariableExpression& operator=(VariableExpression const&) = delete; -#ifndef WINDOWS VariableExpression(VariableExpression&&) = default; VariableExpression& operator=(VariableExpression&&) = delete; -#endif + virtual ~VariableExpression() = default; // Override base class methods. diff --git a/src/storm/storage/prism/Assignment.h b/src/storm/storage/prism/Assignment.h index f53a8bf6a..43777a9d6 100644 --- a/src/storm/storage/prism/Assignment.h +++ b/src/storm/storage/prism/Assignment.h @@ -26,11 +26,9 @@ namespace storm { Assignment() = default; Assignment(Assignment const& other) = default; Assignment& operator=(Assignment const& other)= default; -#ifndef WINDOWS Assignment(Assignment&& other) = default; Assignment& operator=(Assignment&& other) = default; -#endif - + /*! * Retrieves the name of the variable that this assignment targets. * diff --git a/src/storm/storage/prism/BooleanVariable.h b/src/storm/storage/prism/BooleanVariable.h index 8431db46d..80b9ca51e 100644 --- a/src/storm/storage/prism/BooleanVariable.h +++ b/src/storm/storage/prism/BooleanVariable.h @@ -14,10 +14,8 @@ namespace storm { BooleanVariable() = default; BooleanVariable(BooleanVariable const& other) = default; BooleanVariable& operator=(BooleanVariable const& other)= default; -#ifndef WINDOWS BooleanVariable(BooleanVariable&& other) = default; BooleanVariable& operator=(BooleanVariable&& other) = default; -#endif /*! * Creates a boolean variable with the given constant initial value expression. diff --git a/src/storm/storage/prism/Command.h b/src/storm/storage/prism/Command.h index 31dc7a63a..983159c06 100644 --- a/src/storm/storage/prism/Command.h +++ b/src/storm/storage/prism/Command.h @@ -32,11 +32,9 @@ namespace storm { Command() = default; Command(Command const& other) = default; Command& operator=(Command const& other) = default; -#ifndef WINDOWS Command(Command&& other) = default; Command& operator=(Command&& other) = default; -#endif - + /*! * Retrieves the action name of this command. * diff --git a/src/storm/storage/prism/Constant.h b/src/storm/storage/prism/Constant.h index fad235e5c..dfa750eb5 100644 --- a/src/storm/storage/prism/Constant.h +++ b/src/storm/storage/prism/Constant.h @@ -35,11 +35,9 @@ namespace storm { Constant() = default; Constant(Constant const& other) = default; Constant& operator=(Constant const& other)= default; -#ifndef WINDOWS Constant(Constant&& other) = default; Constant& operator=(Constant&& other) = default; -#endif - + /*! * Retrieves the name of the constant. * diff --git a/src/storm/storage/prism/Formula.h b/src/storm/storage/prism/Formula.h index c1bb5aa67..17d2f0cbd 100644 --- a/src/storm/storage/prism/Formula.h +++ b/src/storm/storage/prism/Formula.h @@ -26,11 +26,9 @@ namespace storm { Formula() = default; Formula(Formula const& other) = default; Formula& operator=(Formula const& other)= default; -#ifndef WINDOWS Formula(Formula&& other) = default; Formula& operator=(Formula&& other) = default; -#endif - + /*! * Retrieves the name that is associated with this formula. * diff --git a/src/storm/storage/prism/InitialConstruct.h b/src/storm/storage/prism/InitialConstruct.h index a8aba856e..7eebe9428 100644 --- a/src/storm/storage/prism/InitialConstruct.h +++ b/src/storm/storage/prism/InitialConstruct.h @@ -32,11 +32,9 @@ namespace storm { InitialConstruct() = default; InitialConstruct(InitialConstruct const& other) = default; InitialConstruct& operator=(InitialConstruct const& other)= default; -#ifndef WINDOWS InitialConstruct(InitialConstruct&& other) = default; InitialConstruct& operator=(InitialConstruct&& other) = default; -#endif - + /*! * Retrieves the expression characterizing the initial states. * diff --git a/src/storm/storage/prism/IntegerVariable.h b/src/storm/storage/prism/IntegerVariable.h index d849167f2..3ddfd03e7 100644 --- a/src/storm/storage/prism/IntegerVariable.h +++ b/src/storm/storage/prism/IntegerVariable.h @@ -14,10 +14,8 @@ namespace storm { IntegerVariable() = default; IntegerVariable(IntegerVariable const& other) = default; IntegerVariable& operator=(IntegerVariable const& other)= default; -#ifndef WINDOWS IntegerVariable(IntegerVariable&& other) = default; IntegerVariable& operator=(IntegerVariable&& other) = default; -#endif /*! * Creates an integer variable with the given initial value expression. diff --git a/src/storm/storage/prism/Label.h b/src/storm/storage/prism/Label.h index 99690c583..eb07e7013 100644 --- a/src/storm/storage/prism/Label.h +++ b/src/storm/storage/prism/Label.h @@ -34,11 +34,9 @@ namespace storm { Label() = default; Label(Label const& other) = default; Label& operator=(Label const& other)= default; -#ifndef WINDOWS Label(Label&& other) = default; Label& operator=(Label&& other) = default; -#endif - + /*! * Retrieves the name that is associated with this label. * diff --git a/src/storm/storage/prism/LocatedInformation.h b/src/storm/storage/prism/LocatedInformation.h index c97a86a03..0204af130 100644 --- a/src/storm/storage/prism/LocatedInformation.h +++ b/src/storm/storage/prism/LocatedInformation.h @@ -22,11 +22,9 @@ namespace storm { LocatedInformation() = default; LocatedInformation(LocatedInformation const& other) = default; LocatedInformation& operator=(LocatedInformation const& other)= default; -#ifndef WINDOWS LocatedInformation(LocatedInformation&& other) = default; LocatedInformation& operator=(LocatedInformation&& other) = default; -#endif - + /*! * Retrieves the name of the file in which the information was found. * diff --git a/src/storm/storage/prism/Module.h b/src/storm/storage/prism/Module.h index 7b26ed2da..9c1286805 100644 --- a/src/storm/storage/prism/Module.h +++ b/src/storm/storage/prism/Module.h @@ -48,11 +48,9 @@ namespace storm { Module() = default; Module(Module const& other) = default; Module& operator=(Module const& other)= default; -#ifndef WINDOWS Module(Module&& other) = default; Module& operator=(Module&& other) = default; -#endif - + /*! * Retrieves the number of boolean variables in the module. * diff --git a/src/storm/storage/prism/Program.h b/src/storm/storage/prism/Program.h index ccf56ead6..4fe0f8432 100644 --- a/src/storm/storage/prism/Program.h +++ b/src/storm/storage/prism/Program.h @@ -63,11 +63,9 @@ namespace storm { Program() = default; Program(Program const& other) = default; Program& operator=(Program const& other) = default; -#ifndef WINDOWS Program(Program&& other) = default; Program& operator=(Program&& other) = default; -#endif - + /*! * Retrieves the model type of the model. * diff --git a/src/storm/storage/prism/RewardModel.h b/src/storm/storage/prism/RewardModel.h index 1fee6c901..cda14bdc4 100644 --- a/src/storm/storage/prism/RewardModel.h +++ b/src/storm/storage/prism/RewardModel.h @@ -31,11 +31,9 @@ namespace storm { RewardModel() = default; RewardModel(RewardModel const& other) = default; RewardModel& operator=(RewardModel const& other)= default; -#ifndef WINDOWS RewardModel(RewardModel&& other) = default; RewardModel& operator=(RewardModel&& other) = default; -#endif - + /*! * Retrieves the name of the reward model. * diff --git a/src/storm/storage/prism/StateActionReward.h b/src/storm/storage/prism/StateActionReward.h index 8e56a8829..d54d99b88 100644 --- a/src/storm/storage/prism/StateActionReward.h +++ b/src/storm/storage/prism/StateActionReward.h @@ -38,11 +38,9 @@ namespace storm { StateActionReward() = default; StateActionReward(StateActionReward const& other) = default; StateActionReward& operator=(StateActionReward const& other)= default; -#ifndef WINDOWS StateActionReward(StateActionReward&& other) = default; StateActionReward& operator=(StateActionReward&& other) = default; -#endif - + /*! * Retrieves the action name that is associated with this transition reward. * diff --git a/src/storm/storage/prism/StateReward.h b/src/storm/storage/prism/StateReward.h index 562a0a5bc..b7075588c 100644 --- a/src/storm/storage/prism/StateReward.h +++ b/src/storm/storage/prism/StateReward.h @@ -35,11 +35,9 @@ namespace storm { StateReward() = default; StateReward(StateReward const& other) = default; StateReward& operator=(StateReward const& other)= default; -#ifndef WINDOWS StateReward(StateReward&& other) = default; StateReward& operator=(StateReward&& other) = default; -#endif - + /*! * Retrieves the state predicate that is associated with this state reward. * diff --git a/src/storm/storage/prism/SystemCompositionConstruct.h b/src/storm/storage/prism/SystemCompositionConstruct.h index 0eb016487..d4f1aeba1 100644 --- a/src/storm/storage/prism/SystemCompositionConstruct.h +++ b/src/storm/storage/prism/SystemCompositionConstruct.h @@ -26,11 +26,9 @@ namespace storm { SystemCompositionConstruct() = default; SystemCompositionConstruct(SystemCompositionConstruct const& other) = default; SystemCompositionConstruct& operator=(SystemCompositionConstruct const& other)= default; -#ifndef WINDOWS SystemCompositionConstruct(SystemCompositionConstruct&& other) = default; SystemCompositionConstruct& operator=(SystemCompositionConstruct&& other) = default; -#endif - + Composition const& getSystemComposition() const; friend std::ostream& operator<<(std::ostream& stream, SystemCompositionConstruct const& systemCompositionConstruct); diff --git a/src/storm/storage/prism/TransitionReward.h b/src/storm/storage/prism/TransitionReward.h index 64f0bd903..5f4f9e19d 100644 --- a/src/storm/storage/prism/TransitionReward.h +++ b/src/storm/storage/prism/TransitionReward.h @@ -41,11 +41,9 @@ namespace storm { TransitionReward() = default; TransitionReward(TransitionReward const& other) = default; TransitionReward& operator=(TransitionReward const& other)= default; -#ifndef WINDOWS TransitionReward(TransitionReward&& other) = default; TransitionReward& operator=(TransitionReward&& other) = default; -#endif - + /*! * Retrieves the action name that is associated with this transition reward. * diff --git a/src/storm/storage/prism/Update.h b/src/storm/storage/prism/Update.h index f4f4b8384..b27ddfff4 100644 --- a/src/storm/storage/prism/Update.h +++ b/src/storm/storage/prism/Update.h @@ -26,11 +26,9 @@ namespace storm { Update() = default; Update(Update const& other) = default; Update& operator=(Update const& other)= default; -#ifndef WINDOWS Update(Update&& other) = default; Update& operator=(Update&& other) = default; -#endif - + /*! * Retrieves the expression for the likelihood of this update. * diff --git a/src/storm/storage/prism/Variable.h b/src/storm/storage/prism/Variable.h index 3d379cd25..42ba9aec0 100644 --- a/src/storm/storage/prism/Variable.h +++ b/src/storm/storage/prism/Variable.h @@ -15,11 +15,9 @@ namespace storm { // Create default implementations of constructors/assignment. Variable(Variable const& otherVariable) = default; Variable& operator=(Variable const& otherVariable)= default; -#ifndef WINDOWS Variable(Variable&& otherVariable) = default; Variable& operator=(Variable&& otherVariable) = default; -#endif - + /*! * Retrieves the name of the variable. *