Merge pull request #22017 from gartung/TrackingTools-PatternTools-ESP…

…roducers-update TrackingTools/PatternTools: ESProducers updated to return unique_ptr.
cms-sw · Jan 30, 2018 · 90fd49c · 90fd49c
2 parents a176e2b + 254947c
commit 90fd49c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/TrackingTools/PatternTools/plugins/TSCBLBuilderNoMaterialESProducer.cc b/TrackingTools/PatternTools/plugins/TSCBLBuilderNoMaterialESProducer.cc
@@ -27,7 +27,7 @@ class TSCBLBuilderNoMaterialESProducer : public edm::ESProducer {
       TSCBLBuilderNoMaterialESProducer(const edm::ParameterSet&);
       ~TSCBLBuilderNoMaterialESProducer() override;
 
-      typedef std::shared_ptr<TrajectoryStateClosestToBeamLineBuilder> ReturnType;
+      typedef std::unique_ptr<TrajectoryStateClosestToBeamLineBuilder> ReturnType;
 
       ReturnType produce(const TrackingComponentsRecord&);
    private:
@@ -74,7 +74,7 @@ TSCBLBuilderNoMaterialESProducer::ReturnType
 TSCBLBuilderNoMaterialESProducer::produce(const TrackingComponentsRecord& iRecord)
 {
    using namespace edm::es;
-   TSCBLBuilderNoMaterialESProducer::ReturnType pTSCBLBuilderNoMaterial(new TSCBLBuilderNoMaterial()) ;
+   auto pTSCBLBuilderNoMaterial = std::make_unique<TSCBLBuilderNoMaterial>() ;
 
 
    return pTSCBLBuilderNoMaterial ;

diff --git a/TrackingTools/PatternTools/plugins/TSCBLBuilderWithPropagatorESProducer.cc b/TrackingTools/PatternTools/plugins/TSCBLBuilderWithPropagatorESProducer.cc
@@ -27,7 +27,7 @@ class TSCBLBuilderWithPropagatorESProducer : public edm::ESProducer {
       TSCBLBuilderWithPropagatorESProducer(const edm::ParameterSet&);
       ~TSCBLBuilderWithPropagatorESProducer() override;
 
-      typedef std::shared_ptr<TrajectoryStateClosestToBeamLineBuilder> ReturnType;
+      typedef std::unique_ptr<TrajectoryStateClosestToBeamLineBuilder> ReturnType;
 
       ReturnType produce(const TrackingComponentsRecord&);
    private:
@@ -83,7 +83,7 @@ TSCBLBuilderWithPropagatorESProducer::produce(const TrackingComponentsRecord& iR
 
    const Propagator * pro = theProp.product();
 
-   TSCBLBuilderWithPropagatorESProducer::ReturnType pTSCBLBuilderWithPropagator(new TSCBLBuilderWithPropagator(*pro)) ;
+   auto pTSCBLBuilderWithPropagator = std::make_unique<TSCBLBuilderWithPropagator>(*pro) ;
 
 
    return pTSCBLBuilderWithPropagator ;