Merge pull request #37592 from makortel/deprecatedLegacy

Mark legacy EDModule constructors deprecated
cms-sw · Apr 29, 2022 · 12b3153 · 12b3153
2 parents 46ca85e + f401fce
commit 12b3153
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/FWCore/Framework/interface/EDAnalyzer.h b/FWCore/Framework/interface/EDAnalyzer.h
@@ -26,15 +26,21 @@ namespace edm {
     class ModuleHolderT;
   }
 
-  class CMS_DEPRECATED EDAnalyzer : public EDConsumerBase {
+  /**
+   * The legacy EDAnalyzer class is deprecated. We annotate the
+   * constructor only with the CMS_DEPRECATED, because with gcc it
+   * turns out to flag deriving classes more reliably than annotating
+   * the entire class.
+   */
+  class EDAnalyzer : public EDConsumerBase {
   public:
     template <typename T>
     friend class maker::ModuleHolderT;
     template <typename T>
     friend class WorkerT;
     typedef EDAnalyzer ModuleType;
 
-    EDAnalyzer();
+    CMS_DEPRECATED EDAnalyzer();
     ~EDAnalyzer() override;
 
     std::string workerType() const { return "WorkerT<EDAnalyzer>"; }

diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
@@ -36,15 +36,21 @@ namespace edm {
   class ActivityRegistry;
   class ThinnedAssociationsHelper;
 
-  class CMS_DEPRECATED EDFilter : public ProducerBase, public EDConsumerBase {
+  /**
+   * The legacy EDFilter class is deprecated. We annotate the
+   * constructor only with the CMS_DEPRECATED, because with gcc it
+   * turns out to flag deriving classes more reliably than annotating
+   * the entire class.
+   */
+  class EDFilter : public ProducerBase, public EDConsumerBase {
   public:
     template <typename T>
     friend class maker::ModuleHolderT;
     template <typename T>
     friend class WorkerT;
     typedef EDFilter ModuleType;
 
-    EDFilter();
+    CMS_DEPRECATED EDFilter();
     ~EDFilter() override;
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);

diff --git a/FWCore/Framework/interface/EDProducer.h b/FWCore/Framework/interface/EDProducer.h
@@ -33,15 +33,21 @@ namespace edm {
     class ModuleHolderT;
   }
 
-  class CMS_DEPRECATED EDProducer : public ProducerBase, public EDConsumerBase {
+  /**
+   * The legacy EDProducer class is deprecated. We annotate the
+   * constructor only with the CMS_DEPRECATED, because with gcc it
+   * turns out to flag deriving classes more reliably than annotating
+   * the entire class.
+   */
+  class EDProducer : public ProducerBase, public EDConsumerBase {
   public:
     template <typename T>
     friend class maker::ModuleHolderT;
     template <typename T>
     friend class WorkerT;
     typedef EDProducer ModuleType;
 
-    EDProducer();
+    CMS_DEPRECATED EDProducer();
     ~EDProducer() override;
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);