From 742afbbd7460d19eeee5e2d8c50a2e75762e5993 Mon Sep 17 00:00:00 2001
From: Stefan Wunsch <stefan.wunsch@cern.ch>
Date: Mon, 27 May 2019 12:04:08 +0200
Subject: [PATCH] [Math][ROOT-10131] Fix gcc9 warnings (-Wdeprecated-copy) for
Minuit2
- MnCross: Set default assignment operator
- MinosError: Set default assignment operator
- ABObj: Delete private assignment operator
---
math/minuit2/inc/Minuit2/ABObj.h | 2 +-
math/minuit2/inc/Minuit2/MinosError.h | 2 ++
math/minuit2/inc/Minuit2/MnCross.h | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/math/minuit2/inc/Minuit2/ABObj.h b/math/minuit2/inc/Minuit2/ABObj.h
index 38ac37d1590..e8029243bf1 100644
--- a/math/minuit2/inc/Minuit2/ABObj.h
+++ b/math/minuit2/inc/Minuit2/ABObj.h
@@ -70,7 +70,7 @@ public:
private:
- ABObj& operator=(const ABObj&) {return *this;}
+ ABObj& operator=(const ABObj&) = delete;
public:
diff --git a/math/minuit2/inc/Minuit2/MinosError.h b/math/minuit2/inc/Minuit2/MinosError.h
index 2b695ad5fe6..5a4516929ff 100644
--- a/math/minuit2/inc/Minuit2/MinosError.h
+++ b/math/minuit2/inc/Minuit2/MinosError.h
@@ -34,6 +34,8 @@ public:
MinosError(const MinosError& err) : fParameter(err.fParameter), fMinValue(err.fMinValue), fUpper(err.fUpper), fLower(err.fLower) {}
+ MinosError& operator=(const MinosError& ) = default;
+
MinosError& operator()(const MinosError& err) {
fParameter = err.fParameter;
fMinValue = err.fMinValue;
diff --git a/math/minuit2/inc/Minuit2/MnCross.h b/math/minuit2/inc/Minuit2/MnCross.h
index 61bd3dcf1fd..a6b41958864 100644
--- a/math/minuit2/inc/Minuit2/MnCross.h
+++ b/math/minuit2/inc/Minuit2/MnCross.h
@@ -45,6 +45,8 @@ public:
MnCross(const MnCross& cross) : fValue(cross.fValue), fState(cross.fState), fNFcn(cross.fNFcn), fValid(cross.fValid), fLimset(cross.fLimset), fMaxFcn(cross.fMaxFcn), fNewMin(cross.fNewMin) {}
+ MnCross& operator=(const MnCross&) = default;
+
MnCross& operator()(const MnCross& cross) {
fValue = cross.fValue;
fState = cross.fState;
--
GitLab