Merge pull request #18943 from gartung/RecoBTag-gcc700-dtor-warning-fix

RecoBTag : fix gcc700 warning: class has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor]
cms-sw · May 27, 2017 · 3103b54 · 3103b54
2 parents 6410dcb + d6deaa9
commit 3103b54
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/RecoBTag/SecondaryVertex/interface/CombinedSVComputer.h b/RecoBTag/SecondaryVertex/interface/CombinedSVComputer.h
@@ -42,7 +42,7 @@
 class CombinedSVComputer {
     public:
 	explicit CombinedSVComputer(const edm::ParameterSet &params);
-
+        virtual ~CombinedSVComputer() = default;
 	virtual reco::TaggingVariableList
 	operator () (const reco::TrackIPTagInfo &ipInfo,
 	             const reco::SecondaryVertexTagInfo &svInfo) const;

diff --git a/RecoBTag/SecondaryVertex/interface/CombinedSVSoftLeptonComputer.h b/RecoBTag/SecondaryVertex/interface/CombinedSVSoftLeptonComputer.h
@@ -14,7 +14,7 @@
 class CombinedSVSoftLeptonComputer : public CombinedSVComputer {
     public:
 	explicit CombinedSVSoftLeptonComputer(const edm::ParameterSet &params);
-
+        virtual ~CombinedSVSoftLeptonComputer() = default;	
 	double flipSoftLeptonValue(double value) const;
 
 	template <class IPTI,class SVTI>

diff --git a/RecoBTag/SecondaryVertex/interface/GhostTrackComputer.h b/RecoBTag/SecondaryVertex/interface/GhostTrackComputer.h
@@ -16,7 +16,7 @@
 class GhostTrackComputer {
     public:
 	GhostTrackComputer(const edm::ParameterSet &params);
-
+        virtual ~GhostTrackComputer() = default;
 	virtual reco::TaggingVariableList
 	operator () (const reco::TrackIPTagInfo &ipInfo,
 	             const reco::SecondaryVertexTagInfo &svInfo) const;

diff --git a/RecoBTag/XMLCalibration/interface/CalibratedObject.h b/RecoBTag/XMLCalibration/interface/CalibratedObject.h
@@ -14,6 +14,7 @@
 class CalibratedObject 
 {
   public:
+    virtual ~CalibratedObject() = default;
     /** This function has to be implemented in derived class.
     * It should read all the information the calibrated objects need to
     * load to be initialized from the xml file.