Merge pull request #36624 from bsunanda/Run3-gex109E

Run3-gex109E Avoid compilation warnings in some Validation classes in EventGenerator, Mixing and MtdValidation
cms-sw · Jan 11, 2022 · 5f0565f · 5f0565f
2 parents afbbf4e + 7486cb1
commit 5f0565f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/Validation/EventGenerator/interface/DuplicationChecker.h b/Validation/EventGenerator/interface/DuplicationChecker.h
@@ -9,7 +9,6 @@
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Run.h"

diff --git a/Validation/EventGenerator/interface/WValidation.h b/Validation/EventGenerator/interface/WValidation.h
@@ -9,7 +9,6 @@
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Run.h"

diff --git a/Validation/Mixing/interface/TestSuite.h b/Validation/Mixing/interface/TestSuite.h
@@ -14,7 +14,7 @@
 //
 
 // system include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -42,7 +42,7 @@ class TFile;
 // class declaration
 //
 
-class TestSuite : public edm::EDAnalyzer {
+class TestSuite : public edm::one::EDAnalyzer<> {
 public:
   typedef dqm::legacy::DQMStore DQMStore;
   typedef dqm::legacy::MonitorElement MonitorElement;

diff --git a/Validation/Mixing/src/GlobalTest.cc b/Validation/Mixing/src/GlobalTest.cc
@@ -24,7 +24,6 @@
 #include <fmt/format.h>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"

diff --git a/Validation/Mixing/src/MixCollectionValidation.cc b/Validation/Mixing/src/MixCollectionValidation.cc
@@ -2,7 +2,6 @@
 #include "Validation/Mixing/interface/MixCollectionValidation.h"
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"

diff --git a/Validation/MtdValidation/plugins/Primary4DVertexValidation.cc b/Validation/MtdValidation/plugins/Primary4DVertexValidation.cc
@@ -5,7 +5,6 @@
 #include <algorithm>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/Common/interface/ValidHandle.h"