Skip to content

Commit

Permalink
DQM/SiStripMonitorHardware: replace auto_ptr deprecated and removed i…
Browse files Browse the repository at this point in the history
…n std=c++17
  • Loading branch information
gartung committed Sep 27, 2018
1 parent 6cb583d commit abafef2
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorHardware/src/FEDErrors.cc
Expand Up @@ -235,7 +235,7 @@ bool FEDErrors::fillFatalFEDErrors(const FEDRawData& aFedData,
const unsigned int aPrintDebug)
{

std::auto_ptr<const sistrip::FEDBufferBase> bufferBase;
std::unique_ptr<const sistrip::FEDBufferBase> bufferBase;
try {
bufferBase.reset(new sistrip::FEDBufferBase(aFedData.data(),aFedData.size()));
} catch (const cms::Exception& e) {
Expand Down Expand Up @@ -347,7 +347,7 @@ bool FEDErrors::fillFEDErrors(const FEDRawData& aFedData,
if (!fillFatalFEDErrors(aFedData,aPrintDebug)) return false;

//need to construct full object to go any further
std::auto_ptr<const sistrip::FEDBuffer> buffer;
std::unique_ptr<const sistrip::FEDBuffer> buffer;
buffer.reset(new sistrip::FEDBuffer(aFedData.data(),aFedData.size(),true));

//fill remaining unpackerFEDcheck
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc
Expand Up @@ -233,7 +233,7 @@ SiStripCMMonitorPlugin::analyze(const edm::Event& iEvent,
continue;
}

std::auto_ptr<const sistrip::FEDBuffer> buffer;
std::unique_ptr<const sistrip::FEDBuffer> buffer;

if (!lFedErrors.fillFatalFEDErrors(fedData,0)) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc
Expand Up @@ -224,7 +224,7 @@ SiStripFEDCheckPlugin::analyze(const edm::Event& iEvent, const edm::EventSetup&
bool hasFatalErrors = false;
float rateNonFatal = 0;

std::auto_ptr<const sistrip::FEDBuffer> buffer;
std::unique_ptr<const sistrip::FEDBuffer> buffer;

if (!lFedErrors.fillFatalFEDErrors(fedData,0)) {
hasFatalErrors = true;
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorHardware/src/SiStripSpyIdentifyRuns.cc
Expand Up @@ -121,7 +121,7 @@ namespace sistrip {
if ( !input.data() ||!input.size() ) continue;

//construct FEDBuffer
std::auto_ptr<sistrip::FEDSpyBuffer> buffer;
std::unique_ptr<sistrip::FEDSpyBuffer> buffer;
try {
buffer.reset(new sistrip::FEDSpyBuffer(input.data(),input.size()));
} catch (const cms::Exception& e) {
Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorHardware/src/SiStripSpyUnpacker.cc
Expand Up @@ -124,7 +124,7 @@ namespace sistrip {
auto conns = cabling.fedConnections(lFedId);

//construct FEDBuffer
std::auto_ptr<sistrip::FEDSpyBuffer> buffer;
std::unique_ptr<sistrip::FEDSpyBuffer> buffer;
try {
buffer.reset(new sistrip::FEDSpyBuffer(input.data(),input.size()));
if (!buffer->doChecks() && !allowIncompleteEvents_) {
Expand Down Expand Up @@ -209,7 +209,7 @@ namespace sistrip {
*aRunRef = lRef;

//create DSV to return
std::auto_ptr<RawDigis> pResult = dsvFiller.createDetSetVector();
std::unique_ptr<RawDigis> pResult = dsvFiller.createDetSetVector();
pDigis->swap(*pResult);

} // end of SpyUnpacker::createDigis method.
Expand Down

0 comments on commit abafef2

Please sign in to comment.