Move RootHandlers base class to FWCore/AbstractServices

Author: makortel

FWCore/Utilities/interface/RootHandlers.h …bstractServices/interface/RootHandlers.hFWCore/Utilities/interface/RootHandlers.h renamed to FWCore/AbstractServices/interface/RootHandlers.h FWCore/Utilities/interface/RootHandlers.h renamed to FWCore/AbstractServices/interface/RootHandlers.h

@@ -1,5 +1,5 @@
-#ifndef FWCore_Utilities_RootHandlers_h
-#define FWCore_Utilities_RootHandlers_h
+#ifndef FWCore_AbstractServices_interface_RootHandlers_h
+#define FWCore_AbstractServices_interface_RootHandlers_h
 
 #include "FWCore/Utilities/interface/propagate_const.h"
 namespace edm {
@@ -20,7 +20,12 @@ namespace edm {
     friend class edm::EventProcessor;
 
   public:
-    virtual ~RootHandlers() {}
+    RootHandlers() = default;
+    RootHandlers(RootHandlers const&) = delete;
+    RootHandlers& operator=(RootHandlers const&) = delete;
+    RootHandlers(RootHandlers&&) = delete;
+    RootHandlers& operator=(RootHandlers&&) = delete;
+    virtual ~RootHandlers() = default;
 
     template <typename F>
     void ignoreWarningsWhileDoing(F iFunc, SeverityLevel level = SeverityLevel::kWarning) {
@@ -36,4 +41,4 @@ namespace edm {
   };
 }  // end of namespace edm
 
-#endif  // InitRootHandlers_H
+#endif

FWCore/Framework/src/EventProcessor.cc

@@ -55,6 +55,8 @@
 #include "FWCore/ParameterSet/interface/Registry.h"
 #include "FWCore/ParameterSet/interface/validateTopLevelParameterSets.h"
 
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
+
 #include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
@@ -74,7 +76,6 @@
 #include "FWCore/Utilities/interface/UnixSignalHandlers.h"
 #include "FWCore/Utilities/interface/ExceptionCollector.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "FWCore/Utilities/interface/RootHandlers.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 

FWCore/Services/plugins/InitRootHandlers.cc

@@ -1,4 +1,4 @@
-#include "FWCore/Utilities/interface/RootHandlers.h"
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
 
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ServiceRegistry/interface/SystemBounds.h"

IOPool/Common/BuildFile.xml

@@ -1,3 +1,4 @@
+<use name="FWCore/AbstractServices"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <export>

IOPool/Common/src/RootServiceChecker.cc

@@ -1,7 +1,7 @@
 #include "IOPool/Common/interface/RootServiceChecker.h"
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "FWCore/Utilities/interface/RootHandlers.h"
 
 namespace edm {
   RootServiceChecker::RootServiceChecker() {

IOPool/Output/BuildFile.xml

@@ -2,6 +2,7 @@
 <use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
+<use name="FWCore/AbstractServices"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>

IOPool/Output/src/RootOutputTree.cc

@@ -3,12 +3,12 @@
 
 #include "DataFormats/Common/interface/RefCoreStreamer.h"
 #include "DataFormats/Provenance/interface/ProductDescription.h"
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "FWCore/Utilities/interface/RootHandlers.h"
 #include "FWCore/Catalog/interface/SiteLocalConfig.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"