Skip to content
Snippets Groups Projects
Commit 655bf8da authored by Scott Snyder's avatar Scott Snyder Committed by scott snyder
Browse files

TrigT1Interfaces: 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.
parent 2eed5797
No related branches found
No related tags found
No related merge requests found
Showing
with 12 additions and 36 deletions
// Dear emacs, this is -*- c++ -*-
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
Coordinate.h - description
......@@ -47,7 +47,7 @@ namespace LVL1 {
public:
Coordinate( double phi, double eta );
Coordinate();
virtual ~Coordinate();
virtual ~Coordinate() = default;
void setCoords( double phi, double eta );
double eta() const;
......
// Dear emacs, this is -*- c++ -*-
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
CoordinateRange.h - description
......@@ -32,7 +32,7 @@ class CoordinateRange : public Coordinate {
public:
CoordinateRange(double phiMin, double phiMax, double etaMin, double etaMax);
CoordinateRange();
virtual ~CoordinateRange();
virtual ~CoordinateRange() = default;
void setRanges(double phiMin, double phiMax, double etaMin, double etaMax);
PhiRange phiRange() const;
......
......@@ -27,7 +27,8 @@ namespace LVL1 {
//constructor
MuCTPIL1Topo();
MuCTPIL1Topo(std::vector<MuCTPIL1TopoCandidate> candList);
~MuCTPIL1Topo();
MuCTPIL1Topo(const MuCTPIL1Topo&) = default;
~MuCTPIL1Topo() = default;
//Return the vector of muon to L1Topo candidates
std::vector<MuCTPIL1TopoCandidate> getCandidates() const;
......
......@@ -27,7 +27,7 @@ namespace LVL1 {
MuCTPIL1TopoCandidate();
~MuCTPIL1TopoCandidate();
~MuCTPIL1TopoCandidate() = default;
// set candidate data
void setCandidateData(std::string sectorName,
......
......@@ -19,7 +19,7 @@ namespace LVL1 {
public:
PhiRange();
PhiRange( double min, double max );
virtual ~PhiRange();
~PhiRange() = default;
double min() const;
double max() const;
......
......@@ -19,7 +19,7 @@ namespace LVL1 {
public:
Range() ;
Range( double min, double max );
virtual ~Range();
~Range() = default;
double min() const;
double max() const;
......
......@@ -27,7 +27,7 @@ class iRecCoordRoI {
public:
iRecCoordRoI();
virtual ~iRecCoordRoI();
virtual ~iRecCoordRoI() = default;
/** override this method & return eta coord */
virtual double eta() const = 0;
/** override this method & return phi coord */
......
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
Coordinate.cxx - description
......@@ -27,11 +27,6 @@ namespace LVL1 {
}
// Destructor
Coordinate::~Coordinate() {
}
/** change coords of an existing Coordinate object*/
void Coordinate::setCoords( double phi, double eta ) {
......
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
CoordinateRange.cxx - description
......@@ -22,9 +22,6 @@ CoordinateRange::CoordinateRange(double phiMin, double phiMax, double etaMin,
CoordinateRange::CoordinateRange()
: m_phiRange(0.0, 0.0), m_etaRange(0.0, 0.0) {}
// Destructor
CoordinateRange::~CoordinateRange() {}
/** change coords of an existing CoordinateRange object*/
void CoordinateRange::setRanges(double phiMin, double phiMax, double etaMin,
double etaMax) {
......
......@@ -13,10 +13,6 @@ namespace LVL1 {
m_muonTopoCandidates = candList;
}
MuCTPIL1Topo::~MuCTPIL1Topo() {
}
MuCTPIL1Topo& MuCTPIL1Topo::operator=( const MuCTPIL1Topo& a ) {
clearCandidates();
......
......@@ -13,9 +13,6 @@ namespace LVL1 {
m_bcid(0), m_ptThresholdID(0), m_ptL1TopoCode(0), m_ptValue(0), m_eta(0), m_phi(0), m_etacode(0), m_phicode(0),
m_etamin(0), m_etamax(0), m_phimin(0), m_phimax(0), m_roiWord(0), m_mioctID(0), m_ieta(0), m_iphi(0) {}
MuCTPIL1TopoCandidate::~MuCTPIL1TopoCandidate() {
}
void MuCTPIL1TopoCandidate::setCandidateData(std::string sectorName,
unsigned int roiID,
unsigned int bcid,
......
......@@ -27,10 +27,6 @@ namespace LVL1 {
checkValues();
}
PhiRange::~PhiRange() {
}
double PhiRange::min() const {
return m_min;
}
......
......@@ -23,10 +23,6 @@ namespace LVL1 {
checkValues();
}
Range::~Range() {
}
double Range::min() const {
return m_min;
}
......
......@@ -12,5 +12,3 @@
iRecCoordRoI::iRecCoordRoI(){
}
iRecCoordRoI::~iRecCoordRoI(){
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment