From 555fd90536bf65715b50011278c90d00c84f2f8b Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Thu, 10 Oct 2019 13:17:15 +0200 Subject: [PATCH] Silenced a few warnings. --- src/storm-parsers/parser/ExpressionParser.h | 4 ++-- src/storm-parsers/parser/FormulaParserGrammar.h | 4 ++-- src/storm/solver/SmtSolver.h | 4 ++-- src/storm/storage/expressions/BinaryRelationExpression.h | 4 ++-- src/storm/storage/expressions/ExpressionManager.h | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/storm-parsers/parser/ExpressionParser.h b/src/storm-parsers/parser/ExpressionParser.h index 7a4b91a39..ec7da8dad 100644 --- a/src/storm-parsers/parser/ExpressionParser.h +++ b/src/storm-parsers/parser/ExpressionParser.h @@ -49,8 +49,8 @@ namespace storm { ExpressionParser(storm::expressions::ExpressionManager const& manager, qi::symbols const& invalidIdentifiers_ = qi::symbols(), bool enableErrorHandling = true, bool allowBacktracking = false); ~ExpressionParser(); - ExpressionParser(ExpressionParser const& other) = default; - ExpressionParser& operator=(ExpressionParser const& other) = default; + ExpressionParser(ExpressionParser const& other) = delete; + ExpressionParser& operator=(ExpressionParser const& other) = delete; /*! * Sets an identifier mapping that is used to determine valid variables in the expression. The mapped-to diff --git a/src/storm-parsers/parser/FormulaParserGrammar.h b/src/storm-parsers/parser/FormulaParserGrammar.h index 64a38e4c1..b60ef27f0 100644 --- a/src/storm-parsers/parser/FormulaParserGrammar.h +++ b/src/storm-parsers/parser/FormulaParserGrammar.h @@ -25,8 +25,8 @@ namespace storm { FormulaParserGrammar(std::shared_ptr const& manager); FormulaParserGrammar(std::shared_ptr const& manager); - FormulaParserGrammar(FormulaParserGrammar const& other) = default; - FormulaParserGrammar& operator=(FormulaParserGrammar const& other) = default; + FormulaParserGrammar(FormulaParserGrammar const& other) = delete; + FormulaParserGrammar& operator=(FormulaParserGrammar const& other) = delete; /*! * Adds an identifier and the expression it is supposed to be replaced with. This can, for example be used diff --git a/src/storm/solver/SmtSolver.h b/src/storm/solver/SmtSolver.h index 27a506ff0..7ee3896bd 100644 --- a/src/storm/solver/SmtSolver.h +++ b/src/storm/solver/SmtSolver.h @@ -73,8 +73,8 @@ namespace storm { SmtSolver(SmtSolver const& other) = default; SmtSolver(SmtSolver&& other) = default; - SmtSolver& operator=(SmtSolver const& other) = default; - SmtSolver& operator=(SmtSolver&& other) = default; + SmtSolver& operator=(SmtSolver const& other) = delete; + SmtSolver& operator=(SmtSolver&& other) = delete; /*! * Pushes a backtracking point on the solver's stack. A following call to pop() deletes exactly those diff --git a/src/storm/storage/expressions/BinaryRelationExpression.h b/src/storm/storage/expressions/BinaryRelationExpression.h index b87fe55ef..a386ada0a 100644 --- a/src/storm/storage/expressions/BinaryRelationExpression.h +++ b/src/storm/storage/expressions/BinaryRelationExpression.h @@ -26,9 +26,9 @@ namespace storm { // Instantiate constructors and assignments with their default implementations. BinaryRelationExpression(BinaryRelationExpression const& other) = default; - BinaryRelationExpression& operator=(BinaryRelationExpression const& other) = default; + BinaryRelationExpression& operator=(BinaryRelationExpression const& other) = delete; BinaryRelationExpression(BinaryRelationExpression&&) = default; - BinaryRelationExpression& operator=(BinaryRelationExpression&&) = default; + BinaryRelationExpression& operator=(BinaryRelationExpression&&) = delete; virtual ~BinaryRelationExpression() = default; diff --git a/src/storm/storage/expressions/ExpressionManager.h b/src/storm/storage/expressions/ExpressionManager.h index cf56d5670..03ff93086 100644 --- a/src/storm/storage/expressions/ExpressionManager.h +++ b/src/storm/storage/expressions/ExpressionManager.h @@ -25,8 +25,7 @@ namespace storm { enum class VariableSelection { OnlyRegularVariables, OnlyAuxiliaryVariables, AllVariables }; VariableIterator(ExpressionManager const& manager, std::unordered_map::const_iterator nameIndexIterator, std::unordered_map::const_iterator nameIndexIteratorEnd, VariableSelection const& selection); - VariableIterator(VariableIterator const& other) = default; - VariableIterator& operator=(VariableIterator const& other) = default; + VariableIterator(VariableIterator&& other) = default; // Define the basic input iterator operations. bool operator==(VariableIterator const& other);