Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark legacy EDModule constructors deprecated #37592

Merged
merged 2 commits into from Apr 29, 2022
Merged

Mark legacy EDModule constructors deprecated #37592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a7a5d
Mark the legacy EDModule constructors deprecated
makortel Apr 16, 2022
f401fce
Remove the class-level deprecation annotation from legacy EDModules
makortel Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions FWCore/Framework/interface/EDAnalyzer.h
View file
Open in desktop
Expand Up @@ -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>"; }
Expand Down
10 changes: 8 additions & 2 deletions FWCore/Framework/interface/EDFilter.h
View file
Open in desktop
Expand Up @@ -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);
Expand Down
10 changes: 8 additions & 2 deletions FWCore/Framework/interface/EDProducer.h
View file
Open in desktop
Expand Up @@ -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);
Expand Down