From 4374a43c90963071529341e681075edd8f442020 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 27 Oct 2022 13:43:21 -0500 Subject: [PATCH] Changed profiling analyzers to edm::one::EDAnalyzer This fixes the CMS deprecation warnings. --- .../Callgrind/plugins/CallgrindAnalyzer.cc | 38 ++++++++++--------- .../Callgrind/plugins/ProfilerAnalyzer.cc | 4 +- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/PerfTools/Callgrind/plugins/CallgrindAnalyzer.cc b/PerfTools/Callgrind/plugins/CallgrindAnalyzer.cc index 016e997e30414..2f7f1821f624f 100644 --- a/PerfTools/Callgrind/plugins/CallgrindAnalyzer.cc +++ b/PerfTools/Callgrind/plugins/CallgrindAnalyzer.cc @@ -21,7 +21,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -34,23 +34,25 @@ // #include using namespace std; -class Profiler : public edm::EDAnalyzer { -public: - explicit Profiler(const edm::ParameterSet&); - ~Profiler() override; - -private: - void beginJob() override; - void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override; - - // ----------member data --------------------------- - int m_firstEvent; - int m_lastEvent; - int m_action; - int m_evtCount; -}; - +namespace callgrind { + class Profiler : public edm::one::EDAnalyzer<> { + public: + explicit Profiler(const edm::ParameterSet&); + ~Profiler() override; + + private: + void beginJob() override; + void analyze(const edm::Event&, const edm::EventSetup&) override; + void endJob() override; + + // ----------member data --------------------------- + int m_firstEvent; + int m_lastEvent; + int m_action; + int m_evtCount; + }; +} // namespace callgrind +using namespace callgrind; // // constants, enums and typedefs // diff --git a/PerfTools/Callgrind/plugins/ProfilerAnalyzer.cc b/PerfTools/Callgrind/plugins/ProfilerAnalyzer.cc index 19b9d4bc828e9..1474d87f19375 100644 --- a/PerfTools/Callgrind/plugins/ProfilerAnalyzer.cc +++ b/PerfTools/Callgrind/plugins/ProfilerAnalyzer.cc @@ -23,7 +23,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -33,7 +33,7 @@ // // class declaration // -class ProfilerAnalyzer : public edm::EDAnalyzer { +class ProfilerAnalyzer : public edm::one::EDAnalyzer<> { public: explicit ProfilerAnalyzer(const edm::ParameterSet&); ~ProfilerAnalyzer() override;