From 361fb4349aa1604ea78f3927d6ce47a83f7f4ae8 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Wed, 24 May 2017 16:54:59 -0500 Subject: [PATCH] fix gcc700 warning: class has virtual functions and accessible non-virtual destructor [-Wnon-virtual-dtor] --- EventFilter/L1TRawToDigi/interface/Block.h | 2 +- EventFilter/L1TRawToDigi/interface/PackingSetup.h | 1 + .../L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h | 1 + .../L1TRawToDigi/plugins/implementations_stage2/GTSetup.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/EventFilter/L1TRawToDigi/interface/Block.h b/EventFilter/L1TRawToDigi/interface/Block.h index ca8515e2782ad..bce22d54e196a 100644 --- 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 index 0db631e7dcab9..d98200dc6d972 100644 --- 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 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 index 256d89c59f2de..1364b26fb9198 100644 --- 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 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 index a57be79cb4ec2..e7169978f996e 100644 --- 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 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;