Merge pull request #24708 from gartung/EventFilter-Utilities-strictcxx17

EventFilter/Utilities: replace auto_ptr removed in strict std=c++17
cms-sw · Sep 28, 2018 · fa3f8d6 · fa3f8d6
2 parents acc1167 + 501f4b7
commit fa3f8d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/EventFilter/Utilities/plugins/RawEventFileWriterForBU.h b/EventFilter/Utilities/plugins/RawEventFileWriterForBU.h
@@ -72,7 +72,7 @@ class RawEventFileWriterForBU
   jsoncollector::DataPointDefinition eorJsonDef_;
   bool writtenJSDs_=false;
 
-  std::auto_ptr<std::ofstream> ost_;
+  std::unique_ptr<std::ofstream> ost_;
   std::string fileName_;
   std::string destinationDir_;
 

diff --git a/EventFilter/Utilities/plugins/RawEventOutputModuleForBU.h b/EventFilter/Utilities/plugins/RawEventOutputModuleForBU.h
@@ -46,7 +46,7 @@ class RawEventOutputModuleForBU : public edm::one::OutputModule<edm::one::WatchR
   void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
   void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
 
-  std::auto_ptr<Consumer> templateConsumer_;
+  std::unique_ptr<Consumer> templateConsumer_;
   std::string label_;
   std::string instance_;
   edm::EDGetTokenT<FEDRawDataCollection> token_;

diff --git a/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h b/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h
@@ -50,7 +50,7 @@ namespace evf {
     void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
 
   private:
-    std::auto_ptr<Consumer> c_;
+    std::unique_ptr<Consumer> c_;
     std::string streamLabel_;
     boost::filesystem::path openDatFilePath_;
     boost::filesystem::path openDatChecksumFilePath_;