Hold ProductResolverIndexHelper via const

To set the helper, a temporary is created and filled and then moved to the ProductRegistry.

Author: Dr15Jones

DataFormats/Provenance/interface/ProductRegistry.h

@@ -152,7 +152,7 @@ namespace edm {
       std::array<bool, NumBranchTypes> productProduced_;
       bool anyProductProduced_;
 
-      std::array<edm::propagate_const<std::shared_ptr<ProductResolverIndexHelper>>, NumBranchTypes> productLookups_;
+      std::array<std::shared_ptr<const ProductResolverIndexHelper>, NumBranchTypes> productLookups_;
 
       std::array<ProductResolverIndex, NumBranchTypes> nextIndexValues_;
 

DataFormats/Provenance/src/ProductRegistry.cc

@@ -143,11 +143,7 @@ namespace edm {
   }
 
   std::shared_ptr<ProductResolverIndexHelper const> ProductRegistry::productLookup(BranchType branchType) const {
-    return get_underlying_safe(transient_.productLookups_[branchType]);
-  }
-
-  std::shared_ptr<ProductResolverIndexHelper> ProductRegistry::productLookup(BranchType branchType) {
-    return get_underlying_safe(transient_.productLookups_[branchType]);
+    return transient_.productLookups_[branchType];
   }
 
   void ProductRegistry::setFrozen(bool initializeLookupInfo) {
@@ -319,6 +315,11 @@ namespace edm {
 
     transient_.branchIDToIndex_.clear();
 
+    std::array<std::shared_ptr<ProductResolverIndexHelper>, NumBranchTypes> new_productLookups{
+        {std::make_shared<ProductResolverIndexHelper>(),
+         std::make_shared<ProductResolverIndexHelper>(),
+         std::make_shared<ProductResolverIndexHelper>(),
+         std::make_shared<ProductResolverIndexHelper>()}};
     for (auto const& product : productList_) {
       auto const& desc = product.second;
 
@@ -438,8 +439,7 @@ namespace edm {
             }
           }
         }
-        ProductResolverIndex index = productLookup(desc.branchType())
-                                         ->insert(typeID,
+        ProductResolverIndex index = new_productLookups[desc.branchType()]->insert(typeID,
                                                   desc.moduleLabel().c_str(),
                                                   desc.productInstanceName().c_str(),
                                                   desc.processName().c_str(),
@@ -454,9 +454,12 @@ namespace edm {
       throwMissingDictionariesException(missingDictionaries, context, producedTypes, branchNamesForMissing);
     }
 
-    for (auto& iterProductLookup : transient_.productLookups_) {
+    for (auto& iterProductLookup : new_productLookups) {
       iterProductLookup->setFrozen();
     }
+    for (size_t i = 0; i < new_productLookups.size(); ++i) {
+      transient_.productLookups_[i] = std::move(new_productLookups[i]);
+    }
 
     unsigned int indexIntoNextIndexValue = 0;
     for (auto const& iterProductLookup : transient_.productLookups_) {