From 67d948ac71a4f14e28d6a96edab38f142dcd5121 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Wed, 3 Apr 2019 17:44:46 +0200
Subject: [PATCH] TrigT1Muctpi: Fix gcc9 warnings.

In C++11, implicit declarations of copy and assignment are deprecated if the
class has a user defined destructor or copy or assignment.  gcc9 now warns
about this by default.
Adjust to avoid the warning.
---
 .../src/Common/PtMultiplicitySet.cxx            |  9 ---------
 .../TrigT1Muctpi/src/Common/PtMultiplicitySet.h |  6 ++----
 .../TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h |  2 +-
 .../TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx  | 17 -----------------
 .../TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h    |  6 +-----
 .../TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx |  5 -----
 .../TrigT1Muctpi/src/Mirod/MirodFiFoContent.h   |  2 +-
 .../TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx   |  4 ----
 .../TrigT1Muctpi/src/Mirod/MirodTestRamIn.h     |  2 +-
 9 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx
index e9950e17b7f..0b703b13043 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.cxx
@@ -47,15 +47,6 @@ namespace LVL1MUCTPI {
 
    }
 
-   PtMultiplicitySet& PtMultiplicitySet::operator=( const PtMultiplicitySet& a ) {
-
-      for( unsigned int i = 0; i < MAX_NUMBER_OF_THRESHOLDS; ++i ) {
-         m_multiplicity_pt[ i ] = a.m_multiplicity_pt[ i ];
-      }
-      return *this;
-
-   }
-
    PtMultiplicitySet& PtMultiplicitySet::operator+=( const PtMultiplicitySet& a) {
 
       // No check is performed for the "correctness" of the input PtMultiplicitySet,
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h
index 7967ed12667..aafeb84d020 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Common/PtMultiplicitySet.h
@@ -61,11 +61,9 @@ namespace LVL1MUCTPI {
        */
       int getMultiplicity( const unsigned int threshold ) const;
 
-      /// Assignment operator
-      PtMultiplicitySet& operator=( const PtMultiplicitySet& );
-      /// This operator clippes the multiplicities at a count of sevenn
+      /// This operator clips the multiplicities at a count of sevenn
       PtMultiplicitySet& operator+=( const PtMultiplicitySet& );
-      /// This operator clippes the multiplicities at a count of seven.
+      /// This operator clips the multiplicities at a count of seven.
       PtMultiplicitySet operator+( const PtMultiplicitySet& );
 
       /// Reset the object to 0 multiplicity
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h
index f85f383a9d7..2af52261117 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/EventSource.h
@@ -43,7 +43,7 @@ namespace LVL1MUCTPI {
    class EventSource {
 
    public:
-      virtual ~EventSource() {}
+      virtual ~EventSource() = default;
       virtual const char* printSource() const = 0;
 
    }; // class EventSource
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx
index 1ee2c6bccfe..1b6c4d5ac53 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.cxx
@@ -150,18 +150,6 @@ namespace LVL1MUCTPI {
 
    }
 
-   // assignment operator
-   SectorID& SectorID::operator=( const SectorID& original ) {
-
-     if (this != &original) {
-       this->m_detectorType = original.m_detectorType;
-       this->m_rapidityRegion = original.m_rapidityRegion;
-       this->m_sectorNumber = original.m_sectorNumber;
-     }
-     return *this;
-
-   }
-
    SectorID::operator int() const {
 
       int retval = 0;
@@ -188,9 +176,4 @@ namespace LVL1MUCTPI {
 
    }
 
-   // destructor of class SectorID
-   SectorID::~SectorID() {
-
-   }
-
 } // namespace LVL1MUCTPI
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h
index 73cffda6d82..0e7b1e3cd5f 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mioct/SectorID.h
@@ -141,10 +141,6 @@ namespace LVL1MUCTPI {
        * Provide a comparison operator
        */
       bool operator== ( const SectorID& ) const;
-      /**
-       * Provide a assignment operator
-       */
-      SectorID& operator= ( const SectorID& );
       /**
        * This operator is used when the sector ID has to be stored as a single
        * integer number. (When reading the multiplicity handling from an XML
@@ -158,7 +154,7 @@ namespace LVL1MUCTPI {
       /**
        * The destructor of class SectorID - nothing to destruct
        */
-      ~SectorID();
+      ~SectorID() = default;
 
    private:
       Detector      m_detectorType;
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx
index fecfe4c031f..a877e760ea6 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.cxx
@@ -23,11 +23,6 @@ MirodFiFoContent::MirodFiFoContent() {
 
 }
 
-//destructor of class MirodFiFoContent
-MirodFiFoContent::~MirodFiFoContent() {
-
-}
-
 // print content of Monitoring Fifo in "human" , "hex" or "bin"
 void MirodFiFoContent::printMonFiFo( std::string format ) {
 
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h
index 67ebafeeeed..7d80383a3d2 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodFiFoContent.h
@@ -69,7 +69,7 @@ class MirodFiFoContent {
   /**
    * The destructor of MirodFiFoContent 
    */
-  ~MirodFiFoContent();  
+  ~MirodFiFoContent() = default;
 
  private:
 
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx
index 38aaa4e569d..d3a6c952bf5 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.cxx
@@ -20,7 +20,3 @@ MirodTestRamIn::MirodTestRamIn() {
 
 }
 
-//destructor of class MirodTestRamIn
-MirodTestRamIn::~MirodTestRamIn() {
-
-}
diff --git a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h
index 4c1d1b49423..d0750a2fb29 100644
--- a/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h
+++ b/Trigger/TrigT1/TrigT1Muctpi/src/Mirod/MirodTestRamIn.h
@@ -52,7 +52,7 @@ class MirodTestRamIn {
   /**
    * The destructor of MirodTestRamIn
    */
-  ~MirodTestRamIn();
+  ~MirodTestRamIn() = default;
 
  private:
 
-- 
GitLab