Require ModuleRegistry always be passed to constructor

Author: Dr15Jones

FWCore/Framework/interface/WorkerManager.h

@@ -32,9 +32,6 @@ namespace edm {
   public:
     typedef std::vector<Worker*> AllWorkers;
 
-    WorkerManager(std::shared_ptr<ActivityRegistry> actReg,
-                  ExceptionToActionTable const& actions,
-                  ModuleTypeResolverMaker const* typeResolverMaker);
     WorkerManager(WorkerManager&&) = default;
 
     WorkerManager(std::shared_ptr<ModuleRegistry> modReg,

FWCore/Framework/interface/WorkerRegistry.h

@@ -31,14 +31,13 @@ namespace edm {
   /**
      \class WorkerRegistry WorkerRegistry.h "edm/WorkerRegistry.h"
 
-     \brief The Registry of all workers that where requested
+     \brief The Registry of all workers that were requested
      Holds all instances of workers. In this implementation, Workers 
      are owned.
   */
 
   class WorkerRegistry {
   public:
-    explicit WorkerRegistry(std::shared_ptr<ActivityRegistry> areg, ModuleTypeResolverMaker const* resolverMaker);
     WorkerRegistry(std::shared_ptr<ActivityRegistry> areg, std::shared_ptr<ModuleRegistry> iModReg);
     ~WorkerRegistry();
 

FWCore/Framework/src/WorkerManager.cc

@@ -19,16 +19,6 @@ static const std::string kProducerType("EDProducer");
 
 namespace edm {
   // -----------------------------
-
-  WorkerManager::WorkerManager(std::shared_ptr<ActivityRegistry> areg,
-                               ExceptionToActionTable const& actions,
-                               ModuleTypeResolverMaker const* typeResolverMaker)
-      : workerReg_(areg, typeResolverMaker),
-        actionTable_(&actions),
-        allWorkers_(),
-        unscheduled_(*areg),
-        lastSetupEventPrincipal_(nullptr) {}  // WorkerManager::WorkerManager
-
   WorkerManager::WorkerManager(std::shared_ptr<ModuleRegistry> modReg,
                                std::shared_ptr<ActivityRegistry> areg,
                                ExceptionToActionTable const& actions)

FWCore/Framework/src/WorkerRegistry.cc

@@ -15,9 +15,6 @@
 
 namespace edm {
 
-  WorkerRegistry::WorkerRegistry(std::shared_ptr<ActivityRegistry> areg, ModuleTypeResolverMaker const* resolverMaker)
-      : modRegistry_(std::make_shared<ModuleRegistry>(resolverMaker)), m_workerMap(), actReg_(areg) {}
-
   WorkerRegistry::WorkerRegistry(std::shared_ptr<ActivityRegistry> areg, std::shared_ptr<ModuleRegistry> modReg)
       : modRegistry_(modReg), m_workerMap(), actReg_(areg) {}