Changes based on code review

- fix for clang compilation (class->struct)
- make code more readable/idiomatic

Author: Dr15Jones

FWCore/Framework/interface/maker/ModuleHolder.h

@@ -42,7 +42,7 @@ namespace edm {
   class ProductRegistry;
   class ThinnedAssociationsHelper;
   class ModuleConsumesInfo;
-  class ModuleConsumesMinimalESInfo;
+  struct ModuleConsumesMinimalESInfo;
   namespace maker {
     class ModuleHolder {
     public:

FWCore/Framework/src/PathsAndConsumesOfModules.cc

@@ -143,6 +143,7 @@ namespace edm {
         modulesWhoseProductsAreConsumedBy[iBranchType].clear();
       }
 
+      //The maxModuleID will be used as an index so we need the +1 to accomodate that
       allModuleDescriptions.reserve(moduleRegistry.maxModuleID() + 1);
       moduleIDToHolder.resize(moduleRegistry.maxModuleID() + 1);
       for (auto iBranchType = 0U; iBranchType < NumBranchTypes; ++iBranchType) {

FWCore/Framework/src/Schedule.cc

@@ -423,8 +423,6 @@ namespace edm {
         *moduleRegistry_, proc_pset, *pathNames_, *endPathNames_, prealloc, preg, *areg, processConfiguration);
     resultsInserter_ = std::move(builder.resultsInserter_);
     assert(builder.pathStatusInserters_.size() == builder.pathNameAndModules_.size());
-    assert(builder.endPathStatusInserters_.size() == builder.endpathNameAndModules_.size() or
-           (builder.endpathNameAndModules_.size() == 1 and builder.endPathStatusInserters_.empty()));
     pathStatusInserters_ = std::move(builder.pathStatusInserters_);
     endPathStatusInserters_ = std::move(builder.endPathStatusInserters_);
 
@@ -437,15 +435,17 @@ namespace edm {
     }
     std::vector<StreamSchedule::EndPathInfo> endpaths;
     endpaths.reserve(builder.endpathNameAndModules_.size());
-    index = 0;
-    for (auto& path : builder.endpathNameAndModules_) {
-      if (endPathStatusInserters_.empty()) {
-        endpaths.emplace_back(path.first, std::move(path.second), std::shared_ptr<EndPathStatusInserter>());
-
-      } else {
+    if (builder.endpathNameAndModules_.size() == 1) {
+      assert(endPathStatusInserters_.empty());
+      auto& path = builder.endpathNameAndModules_.front();
+      endpaths.emplace_back(path.first, std::move(path.second), std::shared_ptr<EndPathStatusInserter>());
+    } else {
+      assert(endPathStatusInserters_.size() == builder.endpathNameAndModules_.size());
+      index = 0;
+      for (auto& path : builder.endpathNameAndModules_) {
         endpaths.emplace_back(path.first, std::move(path.second), get_underlying_safe(endPathStatusInserters_[index]));
+        ++index;
       }
-      ++index;
     }
 
     assert(0 < prealloc.numberOfStreams());

FWCore/Framework/src/ScheduleBuilder.cc

@@ -462,7 +462,7 @@ namespace edm {
                                 iProcessConfiguration);
         if (module == nullptr) {
           std::string pathType("endpath");
-          if (std::count(iEndPathNames.begin(), iEndPathNames.end(), iPathName) == 0) {
+          if (std::find(iEndPathNames.begin(), iEndPathNames.end(), iPathName) == iEndPathNames.end()) {
             pathType = std::string("path");
           }
           throw Exception(errors::Configuration)
@@ -476,8 +476,8 @@ namespace edm {
           // See if the filter is allowed.
           std::vector<std::string> allowed_filters =
               ioProcessPSet.getUntrackedParameter<std::vector<std::string>>("@filters_on_endpaths");
-          if (std::count(allowed_filters.begin(), allowed_filters.end(), module->moduleDescription().moduleName()) ==
-              0) {
+          if (std::find(allowed_filters.begin(), allowed_filters.end(), module->moduleDescription().moduleName()) ==
+              allowed_filters.end()) {
             // Filter is not allowed. Ignore the result, and issue a warning.
             filterAction = WorkerInPath::Ignore;
             LogWarning("FilterOnEndPath")
@@ -686,15 +686,17 @@ namespace edm {
         }
       }
       if (!shouldBeUsedLabels.empty()) {
-        std::ostringstream unusedStream;
-        unusedStream << "'" << shouldBeUsedLabels.front() << "'";
-        for (std::vector<std::string>::iterator itLabel = shouldBeUsedLabels.begin() + 1,
-                                                itLabelEnd = shouldBeUsedLabels.end();
-             itLabel != itLabelEnd;
-             ++itLabel) {
-          unusedStream << ",'" << *itLabel << "'";
-        }
-        LogInfo("path") << "The following module labels are not assigned to any path:\n" << unusedStream.str() << "\n";
+        LogInfo("path").log([&shouldBeUsedLabels](auto& l) {
+          l << "The following module labels are not assigned to any path:\n";
+          l << "'" << shouldBeUsedLabels.front() << "'";
+          for (std::vector<std::string>::iterator itLabel = shouldBeUsedLabels.begin() + 1,
+                                                  itLabelEnd = shouldBeUsedLabels.end();
+               itLabel != itLabelEnd;
+               ++itLabel) {
+            l << ",'" << *itLabel << "'";
+          }
+          l << "\n";
+        });
       }
     }
 

FWCore/Framework/src/StreamSchedule.cc

@@ -156,7 +156,7 @@ namespace edm {
       : workerManagerRuns_(modReg, areg, actions),
         workerManagerLumisAndEvents_(modReg, areg, actions),
         actReg_(areg),
-        results_(new HLTGlobalStatus(paths.size())),
+        results_(std::make_shared<HLTGlobalStatus>(paths.size())),
         results_inserter_(),
         trig_paths_(),
         end_paths_(),
@@ -245,7 +245,6 @@ namespace edm {
       }
       //determine if this module could read a branch we want to delete early
       auto consumes = modReg.getExistingModule(w->description()->moduleLabel())->moduleConsumesInfos();
-      //auto consumes = w->moduleConsumesInfos();
       if (not consumes.empty()) {
         bool foundAtLeastOneMatchingBranch = false;
         for (auto const& product : consumes) {