using for ProductDescription

Utilize a using to rename BranchDescription. This avoids forward
compatibility issues with storage to ROOT files.

Author: Dr15Jones

DataFormats/Common/interface/ProductData.h

@@ -9,11 +9,11 @@ is the storage unit of such information.
 ----------------------------------------------------------------------*/
 
 #include "DataFormats/Provenance/interface/Provenance.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 #include <memory>
 
 namespace edm {
-  class ProductDescription;
   class MergeableRunProductMetadataBase;
   class WrapperBase;
 

DataFormats/Common/interface/setIsMergeable.h

@@ -29,11 +29,9 @@
 // Original Author:  W. David Dagenhart
 //         Created:  21 June 2018
 //
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 
 namespace edm {
-
-  class ProductDescription;
-
   void setIsMergeable(ProductDescription&);
 }  // namespace edm
 

DataFormats/FWLite/interface/ChainEvent.h

@@ -26,14 +26,14 @@
 // user include files
 #include "DataFormats/FWLite/interface/Event.h"
 #include "DataFormats/FWLite/interface/EventBase.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 // forward declarations
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
   class ProcessHistory;
-  class ProductDescription;
   class EDProductGetter;
   class EventAux;
   class TriggerResults;

DataFormats/FWLite/interface/DataGetterHelper.h

@@ -20,6 +20,7 @@
 
 // user include files
 #include "DataFormats/Common/interface/EDProductGetter.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "DataFormats/FWLite/interface/HistoryGetterBase.h"
 #include "DataFormats/FWLite/interface/InternalDataKey.h"
 #include "FWCore/FWLite/interface/BranchMapReader.h"
@@ -41,7 +42,6 @@ class TTreeCache;
 class TTree;
 
 namespace edm {
-  class ProductDescription;
   class BranchID;
   class ObjectWithDict;
   class ProductID;

DataFormats/FWLite/interface/Event.h

@@ -63,13 +63,13 @@
 #include "DataFormats/Provenance/interface/EventProcessHistoryID.h"
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"
 #include "DataFormats/Provenance/interface/EventID.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
 // forward declarations
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
-  class ProductDescription;
   class EDProductGetter;
   class EventAux;
   class Timestamp;

DataFormats/FWLite/interface/LuminosityBlock.h

@@ -33,13 +33,13 @@
 #include "DataFormats/FWLite/interface/EntryFinder.h"
 #include "DataFormats/Provenance/interface/ProcessHistoryRegistry.h"
 #include "DataFormats/Provenance/interface/LuminosityBlockAuxiliary.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
 // forward declarations
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
-  class ProductDescription;
   class EDProductGetter;
   class LuminosityBlockAux;
   class Timestamp;

DataFormats/FWLite/interface/MultiChainEvent.h

@@ -26,14 +26,14 @@
 // user include files
 #include "DataFormats/FWLite/interface/EventBase.h"
 #include "DataFormats/FWLite/interface/ChainEvent.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 // forward declarations
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
   class ProcessHistory;
-  class ProductDescription;
   class EDProductGetter;
   class EventAux;
   class TriggerResults;

DataFormats/FWLite/interface/Run.h

@@ -33,6 +33,7 @@
 #include "DataFormats/Provenance/interface/ProcessHistoryRegistry.h"
 #include "DataFormats/Provenance/interface/RunAuxiliary.h"
 #include "DataFormats/Provenance/interface/RunID.h"
+#include "DataFormats/Provenance/interface/ProductDescriptionFwd.h"
 #include "FWCore/FWLite/interface/BranchMapReader.h"
 #include "DataFormats/FWLite/interface/DataGetterHelper.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
@@ -41,7 +42,6 @@
 namespace edm {
   class WrapperBase;
   class ProductRegistry;
-  class ProductDescription;
   class EDProductGetter;
   class RunAux;
   class Timestamp;

DataFormats/FWLite/src/DataGetterHelper.cc

@@ -338,8 +338,8 @@ namespace fwlite {
   }
 
   bool DataGetterHelper::getByProductDescription(edm::ProductDescription const& bDesc,
-                                                Long_t eventEntry,
-                                                KeyToDataMap::iterator& itData) const {
+                                                 Long_t eventEntry,
+                                                 KeyToDataMap::iterator& itData) const {
     if (!bDesc.branchID().isValid()) {
       return false;
     }

DataFormats/FWLite/src/EventBase.cc

@@ -26,7 +26,8 @@
 
 static const edm::ProductID s_id;
 static edm::ProductDescription const s_branch = edm::ProductDescription(edm::ProductDescription());
-static const edm::Provenance s_prov(std::shared_ptr<edm::ProductDescription const>(&s_branch, edm::do_nothing_deleter()),
+static const edm::Provenance s_prov(std::shared_ptr<edm::ProductDescription const>(&s_branch,
+                                                                                   edm::do_nothing_deleter()),
                                     s_id);
 
 namespace fwlite {