From cc625a2e00c0346cf7d751ea12263595654d2550 Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Wed, 16 Apr 2014 17:32:35 +0200
Subject: [PATCH] Added a ton of ifndefs, because MSVC does not yet support
 defaulting move constructors/assignments.

Former-commit-id: 105792abace0ecda8a606e499be3f29b97eddc57
---
 src/storage/expressions/BaseExpression.h                    | 5 ++++-
 src/storage/expressions/BinaryBooleanFunctionExpression.h   | 3 +++
 src/storage/expressions/BinaryExpression.h                  | 3 +++
 src/storage/expressions/BinaryNumericalFunctionExpression.h | 3 +++
 src/storage/expressions/BinaryRelationExpression.h          | 3 +++
 src/storage/expressions/BooleanConstantExpression.h         | 3 +++
 src/storage/expressions/BooleanLiteralExpression.h          | 3 +++
 src/storage/expressions/ConstantExpression.h                | 3 +++
 src/storage/expressions/DoubleConstantExpression.h          | 3 +++
 src/storage/expressions/DoubleLiteralExpression.h           | 3 +++
 src/storage/expressions/Expression.h                        | 3 +++
 src/storage/expressions/Expressions.h                       | 1 +
 src/storage/expressions/IfThenElseExpression.h              | 3 +++
 src/storage/expressions/IntegerConstantExpression.h         | 3 +++
 src/storage/expressions/IntegerLiteralExpression.h          | 3 +++
 src/storage/expressions/UnaryBooleanFunctionExpression.h    | 3 +++
 src/storage/expressions/UnaryExpression.h                   | 3 +++
 src/storage/expressions/UnaryNumericalFunctionExpression.h  | 3 +++
 src/storage/expressions/VariableExpression.h                | 5 ++++-
 src/storage/prism/Assignment.h                              | 3 +++
 src/storage/prism/BooleanVariable.h                         | 3 +++
 src/storage/prism/Command.h                                 | 3 +++
 src/storage/prism/Constant.h                                | 3 +++
 src/storage/prism/Formula.h                                 | 3 +++
 src/storage/prism/IntegerVariable.h                         | 3 +++
 src/storage/prism/Label.h                                   | 3 +++
 src/storage/prism/LocatedInformation.h                      | 4 ++++
 src/storage/prism/Module.h                                  | 3 +++
 src/storage/prism/Program.h                                 | 3 +++
 src/storage/prism/RewardModel.h                             | 3 +++
 src/storage/prism/StateReward.h                             | 3 +++
 src/storage/prism/TransitionReward.h                        | 3 +++
 src/storage/prism/Update.h                                  | 3 +++
 src/storage/prism/Variable.h                                | 3 +++
 34 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/src/storage/expressions/BaseExpression.h b/src/storage/expressions/BaseExpression.h
index 41684255d..fb3df4514 100644
--- a/src/storage/expressions/BaseExpression.h
+++ b/src/storage/expressions/BaseExpression.h
@@ -9,6 +9,7 @@
 #include "src/storage/expressions/Valuation.h"
 #include "src/storage/expressions/ExpressionVisitor.h"
 #include "src/exceptions/InvalidArgumentException.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -33,9 +34,11 @@ namespace storm {
             
             // Create default versions of constructors and assignments.
             BaseExpression(BaseExpression const&) = default;
-            BaseExpression(BaseExpression&&) = default;
             BaseExpression& operator=(BaseExpression const&) = default;
+#ifndef WINDOWS
+            BaseExpression(BaseExpression&&) = default;
             BaseExpression& operator=(BaseExpression&&) = default;
+#endif
             
             // Make the destructor virtual (to allow destruction via base class pointer) and default it.
             virtual ~BaseExpression() = default;
diff --git a/src/storage/expressions/BinaryBooleanFunctionExpression.h b/src/storage/expressions/BinaryBooleanFunctionExpression.h
index 32dfc387d..7a05a1ab5 100644
--- a/src/storage/expressions/BinaryBooleanFunctionExpression.h
+++ b/src/storage/expressions/BinaryBooleanFunctionExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_BINARYBOOLEANFUNCTIONEXPRESSION_H_
 
 #include "src/storage/expressions/BinaryExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -25,8 +26,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             BinaryBooleanFunctionExpression(BinaryBooleanFunctionExpression const& other) = default;
             BinaryBooleanFunctionExpression& operator=(BinaryBooleanFunctionExpression const& other) = default;
+#ifndef WINDOWS
             BinaryBooleanFunctionExpression(BinaryBooleanFunctionExpression&&) = default;
             BinaryBooleanFunctionExpression& operator=(BinaryBooleanFunctionExpression&&) = default;
+#endif
             virtual ~BinaryBooleanFunctionExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/BinaryExpression.h b/src/storage/expressions/BinaryExpression.h
index fd1b1903a..640297a91 100644
--- a/src/storage/expressions/BinaryExpression.h
+++ b/src/storage/expressions/BinaryExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_BINARYEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -22,8 +23,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             BinaryExpression(BinaryExpression const& other) = default;
             BinaryExpression& operator=(BinaryExpression const& other) = default;
+#ifndef WINDOWS
             BinaryExpression(BinaryExpression&&) = default;
             BinaryExpression& operator=(BinaryExpression&&) = default;
+#endif
             virtual ~BinaryExpression() = default;
 
             // Override base class methods.
diff --git a/src/storage/expressions/BinaryNumericalFunctionExpression.h b/src/storage/expressions/BinaryNumericalFunctionExpression.h
index 174763c84..4e8573a4c 100644
--- a/src/storage/expressions/BinaryNumericalFunctionExpression.h
+++ b/src/storage/expressions/BinaryNumericalFunctionExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_BINARYNUMERICALFUNCTIONEXPRESSION_H_
 
 #include "src/storage/expressions/BinaryExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -25,8 +26,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             BinaryNumericalFunctionExpression(BinaryNumericalFunctionExpression const& other) = default;
             BinaryNumericalFunctionExpression& operator=(BinaryNumericalFunctionExpression const& other) = default;
+#ifndef WINDOWS
             BinaryNumericalFunctionExpression(BinaryNumericalFunctionExpression&&) = default;
             BinaryNumericalFunctionExpression& operator=(BinaryNumericalFunctionExpression&&) = default;
+#endif
             virtual ~BinaryNumericalFunctionExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/BinaryRelationExpression.h b/src/storage/expressions/BinaryRelationExpression.h
index 7e3e177c5..b88ef71f9 100644
--- a/src/storage/expressions/BinaryRelationExpression.h
+++ b/src/storage/expressions/BinaryRelationExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_BINARYRELATIONEXPRESSION_H_
 
 #include "src/storage/expressions/BinaryExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -25,8 +26,10 @@ 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/storage/expressions/BooleanConstantExpression.h b/src/storage/expressions/BooleanConstantExpression.h
index fc2e3f8e4..dd204d7a5 100644
--- a/src/storage/expressions/BooleanConstantExpression.h
+++ b/src/storage/expressions/BooleanConstantExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_BOOLEANCONSTANTEXPRESSION_H_
 
 #include "src/storage/expressions/ConstantExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,8 +18,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             BooleanConstantExpression(BooleanConstantExpression const& other) = default;
             BooleanConstantExpression& operator=(BooleanConstantExpression const& other) = default;
+#ifndef WINDOWS
             BooleanConstantExpression(BooleanConstantExpression&&) = default;
             BooleanConstantExpression& operator=(BooleanConstantExpression&&) = default;
+#endif
             virtual ~BooleanConstantExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/BooleanLiteralExpression.h b/src/storage/expressions/BooleanLiteralExpression.h
index 49794b59a..6c0413236 100644
--- a/src/storage/expressions/BooleanLiteralExpression.h
+++ b/src/storage/expressions/BooleanLiteralExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_BOOLEANLITERALEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,8 +18,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             BooleanLiteralExpression(BooleanLiteralExpression const& other) = default;
             BooleanLiteralExpression& operator=(BooleanLiteralExpression const& other) = default;
+#ifndef WINDOWS
             BooleanLiteralExpression(BooleanLiteralExpression&&) = default;
             BooleanLiteralExpression& operator=(BooleanLiteralExpression&&) = default;
+#endif
             virtual ~BooleanLiteralExpression() = default;
 
             // Override base class methods.
diff --git a/src/storage/expressions/ConstantExpression.h b/src/storage/expressions/ConstantExpression.h
index 70ccf6b35..50f00c235 100644
--- a/src/storage/expressions/ConstantExpression.h
+++ b/src/storage/expressions/ConstantExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_CONSTANTEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -18,8 +19,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             ConstantExpression(ConstantExpression const& other) = default;
             ConstantExpression& operator=(ConstantExpression const& other) = default;
+#ifndef WINDOWS
             ConstantExpression(ConstantExpression&&) = default;
             ConstantExpression& operator=(ConstantExpression&&) = default;
+#endif
             virtual ~ConstantExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/DoubleConstantExpression.h b/src/storage/expressions/DoubleConstantExpression.h
index 673ef007b..b271bf6db 100644
--- a/src/storage/expressions/DoubleConstantExpression.h
+++ b/src/storage/expressions/DoubleConstantExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_DOUBLECONSTANTEXPRESSION_H_
 
 #include "src/storage/expressions/ConstantExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,8 +18,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             DoubleConstantExpression(DoubleConstantExpression const& other) = default;
             DoubleConstantExpression& operator=(DoubleConstantExpression const& other) = default;
+#ifndef WINDOWS
             DoubleConstantExpression(DoubleConstantExpression&&) = default;
             DoubleConstantExpression& operator=(DoubleConstantExpression&&) = default;
+#endif
             virtual ~DoubleConstantExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/DoubleLiteralExpression.h b/src/storage/expressions/DoubleLiteralExpression.h
index 1ed293923..e4bc28b81 100644
--- a/src/storage/expressions/DoubleLiteralExpression.h
+++ b/src/storage/expressions/DoubleLiteralExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_DOUBLELITERALEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,8 +18,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             DoubleLiteralExpression(DoubleLiteralExpression const& other) = default;
             DoubleLiteralExpression& operator=(DoubleLiteralExpression const& other) = default;
+#ifndef WINDOWS
             DoubleLiteralExpression(DoubleLiteralExpression&&) = default;
             DoubleLiteralExpression& operator=(DoubleLiteralExpression&&) = default;
+#endif
             virtual ~DoubleLiteralExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/Expression.h b/src/storage/expressions/Expression.h
index 2253c0548..ea7d99572 100644
--- a/src/storage/expressions/Expression.h
+++ b/src/storage/expressions/Expression.h
@@ -4,6 +4,7 @@
 #include <memory>
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -21,8 +22,10 @@ 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
             
             // Static factory methods to create atomic expression parts.
             static Expression createBooleanLiteral(bool value);
diff --git a/src/storage/expressions/Expressions.h b/src/storage/expressions/Expressions.h
index 09febb4a4..df8bbd8ed 100644
--- a/src/storage/expressions/Expressions.h
+++ b/src/storage/expressions/Expressions.h
@@ -1,3 +1,4 @@
+#include "src/storage/expressions/IfThenElseExpression.h"
 #include "src/storage/expressions/BinaryBooleanFunctionExpression.h"
 #include "src/storage/expressions/BinaryNumericalFunctionExpression.h"
 #include "src/storage/expressions/BinaryRelationExpression.h"
diff --git a/src/storage/expressions/IfThenElseExpression.h b/src/storage/expressions/IfThenElseExpression.h
index 1f8e2db41..979cb08f0 100644
--- a/src/storage/expressions/IfThenElseExpression.h
+++ b/src/storage/expressions/IfThenElseExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_IFTHENELSEEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -19,8 +20,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             IfThenElseExpression(IfThenElseExpression const& other) = default;
             IfThenElseExpression& operator=(IfThenElseExpression const& other) = default;
+#ifndef WINDOWS
             IfThenElseExpression(IfThenElseExpression&&) = default;
             IfThenElseExpression& operator=(IfThenElseExpression&&) = default;
+#endif
             virtual ~IfThenElseExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/IntegerConstantExpression.h b/src/storage/expressions/IntegerConstantExpression.h
index 6a808b215..fcf151ead 100644
--- a/src/storage/expressions/IntegerConstantExpression.h
+++ b/src/storage/expressions/IntegerConstantExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_INTEGERCONSTANTEXPRESSION_H_
 
 #include "src/storage/expressions/ConstantExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,8 +18,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             IntegerConstantExpression(IntegerConstantExpression const& other) = default;
             IntegerConstantExpression& operator=(IntegerConstantExpression const& other) = default;
+#ifndef WINDOWS
             IntegerConstantExpression(IntegerConstantExpression&&) = default;
             IntegerConstantExpression& operator=(IntegerConstantExpression&&) = default;
+#endif
             virtual ~IntegerConstantExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/IntegerLiteralExpression.h b/src/storage/expressions/IntegerLiteralExpression.h
index 6cbce6e17..acc2ad4cc 100644
--- a/src/storage/expressions/IntegerLiteralExpression.h
+++ b/src/storage/expressions/IntegerLiteralExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_INTEGERLITERALEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,8 +18,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             IntegerLiteralExpression(IntegerLiteralExpression const& other) = default;
             IntegerLiteralExpression& operator=(IntegerLiteralExpression const& other) = default;
+#ifndef
             IntegerLiteralExpression(IntegerLiteralExpression&&) = default;
             IntegerLiteralExpression& operator=(IntegerLiteralExpression&&) = default;
+#endif
             virtual ~IntegerLiteralExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/UnaryBooleanFunctionExpression.h b/src/storage/expressions/UnaryBooleanFunctionExpression.h
index 954d3659d..1f2800d8e 100644
--- a/src/storage/expressions/UnaryBooleanFunctionExpression.h
+++ b/src/storage/expressions/UnaryBooleanFunctionExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_UNARYBOOLEANFUNCTIONEXPRESSION_H_
 
 #include "src/storage/expressions/UnaryExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -24,8 +25,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             UnaryBooleanFunctionExpression(UnaryBooleanFunctionExpression const& other) = default;
             UnaryBooleanFunctionExpression& operator=(UnaryBooleanFunctionExpression const& other) = default;
+#ifndef WINDOWS
             UnaryBooleanFunctionExpression(UnaryBooleanFunctionExpression&&) = default;
             UnaryBooleanFunctionExpression& operator=(UnaryBooleanFunctionExpression&&) = default;
+#endif
             virtual ~UnaryBooleanFunctionExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/UnaryExpression.h b/src/storage/expressions/UnaryExpression.h
index 686e97c4e..f81bc08ad 100644
--- a/src/storage/expressions/UnaryExpression.h
+++ b/src/storage/expressions/UnaryExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_UNARYEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -18,8 +19,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             UnaryExpression(UnaryExpression const& other);
             UnaryExpression& operator=(UnaryExpression const& other);
+#ifndef WINDOWS
             UnaryExpression(UnaryExpression&&) = default;
             UnaryExpression& operator=(UnaryExpression&&) = default;
+#endif
             virtual ~UnaryExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/UnaryNumericalFunctionExpression.h b/src/storage/expressions/UnaryNumericalFunctionExpression.h
index be717e564..daa0df40f 100644
--- a/src/storage/expressions/UnaryNumericalFunctionExpression.h
+++ b/src/storage/expressions/UnaryNumericalFunctionExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_UNARYNUMERICALFUNCTIONEXPRESSION_H_
 
 #include "src/storage/expressions/UnaryExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -24,8 +25,10 @@ namespace storm {
             // Instantiate constructors and assignments with their default implementations.
             UnaryNumericalFunctionExpression(UnaryNumericalFunctionExpression const& other) = default;
             UnaryNumericalFunctionExpression& operator=(UnaryNumericalFunctionExpression const& other) = default;
+#ifndef WINDOWS
             UnaryNumericalFunctionExpression(UnaryNumericalFunctionExpression&&) = default;
             UnaryNumericalFunctionExpression& operator=(UnaryNumericalFunctionExpression&&) = default;
+#endif
             virtual ~UnaryNumericalFunctionExpression() = default;
             
             // Override base class methods.
diff --git a/src/storage/expressions/VariableExpression.h b/src/storage/expressions/VariableExpression.h
index 1b86274a9..2d83b7160 100644
--- a/src/storage/expressions/VariableExpression.h
+++ b/src/storage/expressions/VariableExpression.h
@@ -2,6 +2,7 @@
 #define STORM_STORAGE_EXPRESSIONS_VARIABLEEXPRESSION_H_
 
 #include "src/storage/expressions/BaseExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace expressions {
@@ -17,9 +18,11 @@ namespace storm {
             
             // Instantiate constructors and assignments with their default implementations.
             VariableExpression(VariableExpression const&) = default;
-            VariableExpression(VariableExpression&&) = default;
             VariableExpression& operator=(VariableExpression const&) = default;
+#ifndef WINDOWS
+            VariableExpression(VariableExpression&&) = default;
             VariableExpression& operator=(VariableExpression&&) = default;
+#endif
             virtual ~VariableExpression() = default;
 
             // Override base class methods.
diff --git a/src/storage/prism/Assignment.h b/src/storage/prism/Assignment.h
index cf71c8960..c6604a03e 100644
--- a/src/storage/prism/Assignment.h
+++ b/src/storage/prism/Assignment.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -24,8 +25,10 @@ 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/storage/prism/BooleanVariable.h b/src/storage/prism/BooleanVariable.h
index 6c70fbafb..f32035010 100644
--- a/src/storage/prism/BooleanVariable.h
+++ b/src/storage/prism/BooleanVariable.h
@@ -4,6 +4,7 @@
 #include <map>
 
 #include "src/storage/prism/Variable.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -13,8 +14,10 @@ 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 name and the default initial value expression.
diff --git a/src/storage/prism/Command.h b/src/storage/prism/Command.h
index 91831d421..6e32eba5e 100644
--- a/src/storage/prism/Command.h
+++ b/src/storage/prism/Command.h
@@ -7,6 +7,7 @@
 
 #include "src/storage/expressions/Expression.h"
 #include "src/storage/prism/Update.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -28,8 +29,10 @@ 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/storage/prism/Constant.h b/src/storage/prism/Constant.h
index 06d8cbf50..0e651b337 100644
--- a/src/storage/prism/Constant.h
+++ b/src/storage/prism/Constant.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -35,8 +36,10 @@ 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/storage/prism/Formula.h b/src/storage/prism/Formula.h
index d507aebb1..167168577 100644
--- a/src/storage/prism/Formula.h
+++ b/src/storage/prism/Formula.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -25,8 +26,10 @@ 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/storage/prism/IntegerVariable.h b/src/storage/prism/IntegerVariable.h
index f85e58701..75e1c513e 100644
--- a/src/storage/prism/IntegerVariable.h
+++ b/src/storage/prism/IntegerVariable.h
@@ -4,6 +4,7 @@
 #include <map>
 
 #include "src/storage/prism/Variable.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -13,8 +14,10 @@ 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 name and a default initial value.
diff --git a/src/storage/prism/Label.h b/src/storage/prism/Label.h
index 18899b41d..e9889bde1 100644
--- a/src/storage/prism/Label.h
+++ b/src/storage/prism/Label.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -25,8 +26,10 @@ 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/storage/prism/LocatedInformation.h b/src/storage/prism/LocatedInformation.h
index 09921a871..8aa4d301e 100644
--- a/src/storage/prism/LocatedInformation.h
+++ b/src/storage/prism/LocatedInformation.h
@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include "src/utility/OsDetection.h"
+
 namespace storm {
     namespace prism {
         class LocatedInformation {
@@ -19,8 +21,10 @@ 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/storage/prism/Module.h b/src/storage/prism/Module.h
index ba23c23c5..f4fd21f29 100644
--- a/src/storage/prism/Module.h
+++ b/src/storage/prism/Module.h
@@ -11,6 +11,7 @@
 #include "src/storage/prism/IntegerVariable.h"
 #include "src/storage/prism/Command.h"
 #include "src/storage/expressions/VariableExpression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -32,8 +33,10 @@ 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/storage/prism/Program.h b/src/storage/prism/Program.h
index 6f4c5e3b1..40f8047e1 100644
--- a/src/storage/prism/Program.h
+++ b/src/storage/prism/Program.h
@@ -12,6 +12,7 @@
 #include "src/storage/prism/Label.h"
 #include "src/storage/prism/Module.h"
 #include "src/storage/prism/RewardModel.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -48,8 +49,10 @@ 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/storage/prism/RewardModel.h b/src/storage/prism/RewardModel.h
index be43834e1..3bb68d1b5 100644
--- a/src/storage/prism/RewardModel.h
+++ b/src/storage/prism/RewardModel.h
@@ -7,6 +7,7 @@
 
 #include "src/storage/prism/StateReward.h"
 #include "src/storage/prism/TransitionReward.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -27,8 +28,10 @@ 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/storage/prism/StateReward.h b/src/storage/prism/StateReward.h
index ea6050855..f64dc9e4d 100644
--- a/src/storage/prism/StateReward.h
+++ b/src/storage/prism/StateReward.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -25,8 +26,10 @@ 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/storage/prism/TransitionReward.h b/src/storage/prism/TransitionReward.h
index 987d7dc89..2c118cec7 100644
--- a/src/storage/prism/TransitionReward.h
+++ b/src/storage/prism/TransitionReward.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -27,8 +28,10 @@ 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/storage/prism/Update.h b/src/storage/prism/Update.h
index 176111acb..b48aa99e4 100644
--- a/src/storage/prism/Update.h
+++ b/src/storage/prism/Update.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/prism/Assignment.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -25,8 +26,10 @@ 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/storage/prism/Variable.h b/src/storage/prism/Variable.h
index 51516bc24..586887870 100644
--- a/src/storage/prism/Variable.h
+++ b/src/storage/prism/Variable.h
@@ -5,6 +5,7 @@
 
 #include "src/storage/prism/LocatedInformation.h"
 #include "src/storage/expressions/Expression.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace prism {
@@ -13,8 +14,10 @@ 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.