Merge pull request #24731 from gartung/RecoBTau-JetTagComputer-strict…

…cxx17 RecoBTau/JetTagComputer: replace auto_ptr removed in strict std=c++17
cms-sw · Sep 28, 2018 · d656880 · d656880
2 parents a02e95f + e2cf866
commit d656880
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/RecoBTau/JetTagComputer/interface/GenericMVAComputerCache.h b/RecoBTau/JetTagComputer/interface/GenericMVAComputerCache.h
@@ -28,7 +28,7 @@ class GenericMVAComputerCache {
 		~IndividualComputer();
 
 		std::string						label;
-		std::auto_ptr<GenericMVAComputer>			computer;
+		std::unique_ptr<GenericMVAComputer>			computer;
 		PhysicsTools::Calibration::MVAComputer::CacheId		cacheId;
 	};
 

diff --git a/RecoBTau/JetTagComputer/interface/GenericMVAJetTagComputer.h b/RecoBTau/JetTagComputer/interface/GenericMVAJetTagComputer.h
@@ -28,7 +28,7 @@ class GenericMVAJetTagComputer : public JetTagComputer {
 	taggingVariables(const TagInfoHelper &info) const;
 
     private:
-	std::auto_ptr<TagInfoMVACategorySelector> categorySelector_;
+	std::unique_ptr<TagInfoMVACategorySelector> categorySelector_;
 	GenericMVAComputerCache computerCache_;
         std::string recordLabel_;
 };

diff --git a/RecoBTau/JetTagComputer/src/GenericMVAComputerCache.cc b/RecoBTau/JetTagComputer/src/GenericMVAComputerCache.cc
@@ -107,7 +107,7 @@ bool GenericMVAComputerCache::update(const MVAComputerContainer *calib)
 			continue;
 
 		// instantiate new MVAComputer with uptodate calibration
-		iter->computer = std::auto_ptr<GenericMVAComputer>(
+		iter->computer = std::unique_ptr<GenericMVAComputer>(
 					new GenericMVAComputer(computerCalib));
 
 		iter->cacheId = computerCalib->getCacheId();

diff --git a/RecoBTau/JetTagComputer/src/GenericMVAJetTagComputer.cc b/RecoBTau/JetTagComputer/src/GenericMVAJetTagComputer.cc
@@ -20,10 +20,10 @@ using namespace PhysicsTools;
 
 static std::vector<std::string>
 getCalibrationLabels(const edm::ParameterSet &params,
-                     std::auto_ptr<TagInfoMVACategorySelector> &selector)
+                     std::unique_ptr<TagInfoMVACategorySelector> &selector)
 {
 	if (params.getParameter<bool>("useCategories")) {
-		selector = std::auto_ptr<TagInfoMVACategorySelector>(
+		selector = std::unique_ptr<TagInfoMVACategorySelector>(
 				new TagInfoMVACategorySelector(params));
 
 		return selector->getCategoryLabels();