Merge pull request #22138 from gartung/CondTools-L1Trigger-ESProducer…

…-returntype CondTools/L1Trigger/plugins: change return type of ESProducers to unique_ptr
cms-sw · Mar 1, 2018 · 236ebf7 · 236ebf7
2 parents e4b8a67 + 5b19abb
commit 236ebf7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CondTools/L1Trigger/plugins/L1SubsystemKeysOnlineProd.cc b/CondTools/L1Trigger/plugins/L1SubsystemKeysOnlineProd.cc
@@ -81,7 +81,7 @@ L1SubsystemKeysOnlineProd::ReturnType
 L1SubsystemKeysOnlineProd::produce(const L1TriggerKeyRcd& iRecord)
 {
    using namespace edm::es;
-   std::shared_ptr<L1TriggerKey> pL1TriggerKey ;
+   std::unique_ptr<L1TriggerKey> pL1TriggerKey ;
 
    // Get L1TriggerKeyList
    L1TriggerKeyList keyList ;
@@ -97,7 +97,7 @@ L1SubsystemKeysOnlineProd::produce(const L1TriggerKeyRcd& iRecord)
        m_forceGeneration )
      {
        // Instantiate new L1TriggerKey
-       pL1TriggerKey = std::make_shared< L1TriggerKey >() ;
+       pL1TriggerKey = std::make_unique< L1TriggerKey >() ;
        pL1TriggerKey->setTSCKey( m_tscKey ) ;
 
        edm::LogVerbatim( "L1-O2O" ) << "TSC KEY " << m_tscKey ;

diff --git a/CondTools/L1Trigger/plugins/L1TriggerKeyDummyProd.cc b/CondTools/L1Trigger/plugins/L1TriggerKeyDummyProd.cc
@@ -106,7 +106,7 @@ L1TriggerKeyDummyProd::ReturnType
 L1TriggerKeyDummyProd::produce(const L1TriggerKeyRcd& iRecord)
 {
    using namespace edm::es;
-   return std::make_shared< L1TriggerKey >(m_key) ;
+   return std::make_unique< L1TriggerKey >(m_key) ;
 }
 
 //define this as a plug-in

diff --git a/CondTools/L1Trigger/plugins/L1TriggerKeyDummyProd.h b/CondTools/L1Trigger/plugins/L1TriggerKeyDummyProd.h
@@ -38,7 +38,7 @@ class L1TriggerKeyDummyProd : public edm::ESProducer {
       L1TriggerKeyDummyProd(const edm::ParameterSet&);
       ~L1TriggerKeyDummyProd() override;
 
-      typedef std::shared_ptr<L1TriggerKey> ReturnType;
+      typedef std::unique_ptr<L1TriggerKey> ReturnType;
 
       ReturnType produce(const L1TriggerKeyRcd&);
    private:

diff --git a/CondTools/L1Trigger/plugins/L1TriggerKeyListDummyProd.cc b/CondTools/L1Trigger/plugins/L1TriggerKeyListDummyProd.cc
@@ -66,10 +66,10 @@ L1TriggerKeyListDummyProd::ReturnType
 L1TriggerKeyListDummyProd::produce(const L1TriggerKeyListRcd& iRecord)
 {
    using namespace edm::es;
-   std::shared_ptr<L1TriggerKeyList> pL1TriggerKeyList ;
-   pL1TriggerKeyList = std::make_shared< L1TriggerKeyList >() ;
+   std::unique_ptr<L1TriggerKeyList> pL1TriggerKeyList ;
+   pL1TriggerKeyList = std::make_unique< L1TriggerKeyList >() ;
    return pL1TriggerKeyList ;
-//   return std::make_shared< L1TriggerKeyList >() ;
+//   return std::make_unique< L1TriggerKeyList >() ;
 }
 
 //define this as a plug-in

diff --git a/CondTools/L1Trigger/plugins/L1TriggerKeyOnlineProd.cc b/CondTools/L1Trigger/plugins/L1TriggerKeyOnlineProd.cc
@@ -86,7 +86,7 @@ L1TriggerKeyOnlineProd::produce(const L1TriggerKeyRcd& iRecord)
        throw ex ;
      }
 
-   std::shared_ptr<L1TriggerKey> pL1TriggerKey = std::make_shared< L1TriggerKey >( *subsystemKeys ) ;
+   std::unique_ptr<L1TriggerKey> pL1TriggerKey = std::make_unique< L1TriggerKey >( *subsystemKeys ) ;
 
   // Collate object keys
   std::vector< std::string >::const_iterator itr = m_subsystemLabels.begin() ;