Merge pull request #43404 from smuzaffar/simulation-fix-deprecated1

[SIMULATION] [DEVEL] Fix warnings on deprecated copy-constructors
cms-sw · Nov 28, 2023 · c65a1a6 · c65a1a6
2 parents b11a7a4 + d9e966b
commit c65a1a6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 24 deletions.
diff --git a/SimDataFormats/CaloHit/interface/CaloHit.h b/SimDataFormats/CaloHit/interface/CaloHit.h
@@ -13,7 +13,6 @@ class CaloHit {
 public:
   CaloHit(int deti, int layi, double ei, double etai, double phii, double timi, uint32_t idi = 0);
   CaloHit();
-  CaloHit(const CaloHit&);
   virtual ~CaloHit();
 
   int det() const { return deth; }

diff --git a/SimDataFormats/CaloHit/src/CaloHit.cc b/SimDataFormats/CaloHit/src/CaloHit.cc
@@ -11,16 +11,6 @@ CaloHit::CaloHit(int deti, int layi, double ei, double etai, double fi, double t
 
 CaloHit::CaloHit() : deth(0), layerh(0), eh(0), etah(0), phih(0), timeh(0), idh(0) {}
 
-CaloHit::CaloHit(const CaloHit& right) {
-  deth = right.deth;
-  layerh = right.layerh;
-  eh = right.eh;
-  etah = right.etah;
-  phih = right.phih;
-  timeh = right.timeh;
-  idh = right.idh;
-}
-
 CaloHit::~CaloHit() {}
 
 bool CaloHit::operator<(const CaloHit& hit) const {

diff --git a/SimDataFormats/CrossingFrame/interface/CrossingFrame.h b/SimDataFormats/CrossingFrame/interface/CrossingFrame.h
@@ -40,6 +40,7 @@ class CrossingFrame {
 
   CrossingFrame() : firstCrossing_(0), lastCrossing_(0), bunchSpace_(75), subdet_(""), maxNbSources_(0) {}
   CrossingFrame(int minb, int maxb, int bunchsp, std::string subdet, unsigned int maxNbSources);
+  CrossingFrame(const CrossingFrame& v) = default;
 
   ~CrossingFrame() { ; }
 

diff --git a/SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h b/SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h
@@ -54,16 +54,6 @@ class MaterialAccountingStep {
     return std::make_pair(part1, part2);
   }
 
-  /// assignement operator
-  MaterialAccountingStep& operator=(const MaterialAccountingStep& step) {
-    m_length = step.m_length;
-    m_radiationLengths = step.m_radiationLengths;
-    m_energyLoss = step.m_energyLoss;
-    m_in = step.m_in;
-    m_out = step.m_out;
-    return *this;
-  }
-
   /// add a step
   MaterialAccountingStep& operator+=(const MaterialAccountingStep& step) {
     m_length += step.m_length;

diff --git a/SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h b/SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h
@@ -129,7 +129,7 @@ class TMultiDimFet : public TNamed {
 
 public:
   TMultiDimFet();
-  //   TMultiDimFet(const TMultiDimFet &in);
+  TMultiDimFet(const TMultiDimFet &in) = default;
   const TMultiDimFet &operator=(const TMultiDimFet &in);
 
   TMultiDimFet(Int_t dimension, EMDFPolyType type = kMonomials, Option_t *option = "");

diff --git a/SimTransport/TotemRPProtonTransportParametrization/src/TMultiDimFet.cc b/SimTransport/TotemRPProtonTransportParametrization/src/TMultiDimFet.cc
@@ -82,7 +82,7 @@ TMultiDimFet::TMultiDimFet() {
 
 const TMultiDimFet &TMultiDimFet::operator=(const TMultiDimFet &in) {
   if (this == &in) {
-    return in;
+    return *this;
   }
 
   fMeanQuantity = in.fMeanQuantity;  // Mean of dependent quantity
@@ -152,7 +152,7 @@ const TMultiDimFet &TMultiDimFet::operator=(const TMultiDimFet &in) {
   fShowCorrelation = in.fShowCorrelation;  // print correlation matrix
   fIsUserFunction = in.fIsUserFunction;    // Flag for user defined function
   fIsVerbose = in.fIsVerbose;              //
-  return in;
+  return *this;
 }
 
 //____________________________________________________________________