diff --git a/CommonTools/Utils/interface/TH1AddDirectorySentry.h b/CommonTools/Utils/interface/TH1AddDirectorySentry.h index 2dda281b45c11..f39dfe90b58cf 100644 --- a/CommonTools/Utils/interface/TH1AddDirectorySentry.h +++ b/CommonTools/Utils/interface/TH1AddDirectorySentry.h @@ -26,9 +26,10 @@ class TH1AddDirectorySentry { TH1AddDirectorySentry(); ~TH1AddDirectorySentry(); -private: TH1AddDirectorySentry(const TH1AddDirectorySentry&) = delete; TH1AddDirectorySentry& operator=(const TH1AddDirectorySentry&) = delete; + +private: bool status_; }; diff --git a/CommonTools/Utils/src/formulaBinaryOperatorEvaluator.h b/CommonTools/Utils/src/formulaBinaryOperatorEvaluator.h index 00618ff7b9778..cb539bda2de94 100644 --- a/CommonTools/Utils/src/formulaBinaryOperatorEvaluator.h +++ b/CommonTools/Utils/src/formulaBinaryOperatorEvaluator.h @@ -84,11 +84,11 @@ namespace reco { return ret; } - private: BinaryOperatorEvaluator(const BinaryOperatorEvaluator&) = delete; const BinaryOperatorEvaluator& operator=(const BinaryOperatorEvaluator&) = delete; + private: // ---------- member data -------------------------------- Op m_operator; }; diff --git a/CommonTools/Utils/src/formulaConstantEvaluator.h b/CommonTools/Utils/src/formulaConstantEvaluator.h index fa6f06c84fce7..ca1024ca04bbe 100644 --- a/CommonTools/Utils/src/formulaConstantEvaluator.h +++ b/CommonTools/Utils/src/formulaConstantEvaluator.h @@ -35,11 +35,11 @@ namespace reco { double evaluate(double const* iVariables, double const* iParameters) const final; std::vector abstractSyntaxTree() const final; - private: ConstantEvaluator(const ConstantEvaluator&) = delete; const ConstantEvaluator& operator=(const ConstantEvaluator&) = delete; + private: // ---------- member data -------------------------------- double m_value; }; diff --git a/CommonTools/Utils/src/formulaEvaluatorBase.h b/CommonTools/Utils/src/formulaEvaluatorBase.h index 69b54c6818f24..68d216908abb0 100644 --- a/CommonTools/Utils/src/formulaEvaluatorBase.h +++ b/CommonTools/Utils/src/formulaEvaluatorBase.h @@ -57,11 +57,11 @@ namespace reco { unsigned int precedence() const { return m_precedence; } void setPrecedenceToParenthesis() { m_precedence = static_cast(Precedence::kParenthesis); } - private: EvaluatorBase(const EvaluatorBase&) = delete; const EvaluatorBase& operator=(const EvaluatorBase&) = delete; + private: // ---------- member data -------------------------------- unsigned int m_precedence; }; diff --git a/CommonTools/Utils/src/formulaFunctionOneArgEvaluator.h b/CommonTools/Utils/src/formulaFunctionOneArgEvaluator.h index 9948a658dabc1..907ebe912cc1b 100644 --- a/CommonTools/Utils/src/formulaFunctionOneArgEvaluator.h +++ b/CommonTools/Utils/src/formulaFunctionOneArgEvaluator.h @@ -45,11 +45,11 @@ namespace reco { return ret; } - private: FunctionOneArgEvaluator(const FunctionOneArgEvaluator&) = delete; const FunctionOneArgEvaluator& operator=(const FunctionOneArgEvaluator&) = delete; + private: // ---------- member data -------------------------------- std::shared_ptr m_arg; std::function m_function; diff --git a/CommonTools/Utils/src/formulaFunctionTwoArgsEvaluator.h b/CommonTools/Utils/src/formulaFunctionTwoArgsEvaluator.h index c60fe97671335..a6311042d8889 100644 --- a/CommonTools/Utils/src/formulaFunctionTwoArgsEvaluator.h +++ b/CommonTools/Utils/src/formulaFunctionTwoArgsEvaluator.h @@ -48,11 +48,11 @@ namespace reco { return ret; } - private: FunctionTwoArgsEvaluator(const FunctionTwoArgsEvaluator&) = delete; const FunctionTwoArgsEvaluator& operator=(const FunctionTwoArgsEvaluator&) = delete; + private: // ---------- member data -------------------------------- std::shared_ptr m_arg1; std::shared_ptr m_arg2; diff --git a/CommonTools/Utils/src/formulaParameterEvaluator.h b/CommonTools/Utils/src/formulaParameterEvaluator.h index e882ce11e14dd..adc4f27108730 100644 --- a/CommonTools/Utils/src/formulaParameterEvaluator.h +++ b/CommonTools/Utils/src/formulaParameterEvaluator.h @@ -35,11 +35,11 @@ namespace reco { double evaluate(double const* iVariables, double const* iParameters) const final; std::vector abstractSyntaxTree() const final; - private: ParameterEvaluator(const ParameterEvaluator&) = delete; const ParameterEvaluator& operator=(const ParameterEvaluator&) = delete; + private: // ---------- member data -------------------------------- unsigned int m_index; }; diff --git a/CommonTools/Utils/src/formulaUnaryMinusEvaluator.h b/CommonTools/Utils/src/formulaUnaryMinusEvaluator.h index e2675d17b2850..3e1a7075c5858 100644 --- a/CommonTools/Utils/src/formulaUnaryMinusEvaluator.h +++ b/CommonTools/Utils/src/formulaUnaryMinusEvaluator.h @@ -44,11 +44,11 @@ namespace reco { return ret; } - private: UnaryMinusEvaluator(const UnaryMinusEvaluator&) = delete; const UnaryMinusEvaluator& operator=(const UnaryMinusEvaluator&) = delete; + private: // ---------- member data -------------------------------- std::shared_ptr m_arg; }; diff --git a/CommonTools/Utils/src/formulaVariableEvaluator.h b/CommonTools/Utils/src/formulaVariableEvaluator.h index 014b1d93d72b1..a2ac89b12ad93 100644 --- a/CommonTools/Utils/src/formulaVariableEvaluator.h +++ b/CommonTools/Utils/src/formulaVariableEvaluator.h @@ -35,11 +35,11 @@ namespace reco { double evaluate(double const* iVariables, double const* iParameters) const final; std::vector abstractSyntaxTree() const final; - private: VariableEvaluator(const VariableEvaluator&) = delete; const VariableEvaluator& operator=(const VariableEvaluator&) = delete; + private: // ---------- member data -------------------------------- unsigned int m_index; };