Merge pull request #18938 from gartung/EventFilter-gcc700-dtor-warnin…

…g-fix EventFilter : fix gcc700 warning: class has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor]
cms-sw · May 30, 2017 · f9dad40 · f9dad40
2 parents 050fad5 + 361fb43
commit f9dad40
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/EventFilter/L1TRawToDigi/interface/Block.h b/EventFilter/L1TRawToDigi/interface/Block.h
@@ -74,7 +74,7 @@ namespace l1t {
    class Payload {
       public:
          Payload(const uint32_t * data, const uint32_t * end) : data_(data), end_(end), algo_(0), infra_(0) {};
-
+         virtual ~Payload() {};
          virtual unsigned getAlgorithmFWVersion() const { return algo_; };
          virtual unsigned getInfrastructureFWVersion() const { return infra_; };
          virtual unsigned getHeaderSize() const = 0;

diff --git a/EventFilter/L1TRawToDigi/interface/PackingSetup.h b/EventFilter/L1TRawToDigi/interface/PackingSetup.h
@@ -29,6 +29,7 @@ namespace l1t {
    class PackingSetup {
       public:
          PackingSetup() {};
+         virtual ~PackingSetup() {};
          virtual std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet&, edm::ConsumesCollector&) = 0;
          virtual void registerProducts(edm::stream::EDProducerBase&) = 0;
 

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h
@@ -13,6 +13,7 @@ namespace l1t {
    namespace stage1 {
       class CaloSetup : public PackingSetup {
          public:
+            virtual ~CaloSetup() {};
             virtual std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
             virtual void fillDescription(edm::ParameterSetDescription& desc) override;
             virtual PackerMap getPackers(int fed, unsigned int fw) override;

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h
@@ -13,6 +13,7 @@ namespace l1t {
    namespace stage2 {
       class GTSetup : public PackingSetup {
          public:
+            virtual ~GTSetup() {};
             virtual std::unique_ptr<PackerTokens> registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override;
             virtual void fillDescription(edm::ParameterSetDescription& desc) override;
             virtual PackerMap getPackers(int fed, unsigned int fw) override;