Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DQM/SiStripCommissioningClients: replace auto_ptr deprecated and removed in std=c++17 #24697

Merged
merged 1 commit into from Oct 1, 2018
Merged

DQM/SiStripCommissioningClients: replace auto_ptr deprecated and removed in std=c++17 #24697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/interface/CommissioningHistograms.h
View file
Open in desktop
Expand Up @@ -141,7 +141,7 @@ class CommissioningHistograms {

protected:

std::auto_ptr<Factory> factory_;
std::unique_ptr<Factory> factory_;

private:

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/interface/FedCablingHistograms.h
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ class FedCablingHistograms : virtual public CommissioningHistograms {

Analyses data_;

std::auto_ptr<Factory> factory_;
std::unique_ptr<Factory> factory_;

};

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/interface/FedTimingHistograms.h
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ class FedTimingHistograms : public CommissioningHistograms {

std::map<uint32_t,FedTimingAnalysis> data_;

std::auto_ptr<Factory> factory_;
std::unique_ptr<Factory> factory_;

const float optimumSamplingPoint_;
float minDelay_;
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/ApvTimingHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ ApvTimingHistograms::ApvTimingHistograms( const edm::ParameterSet& pset,
bei,
sistrip::APV_TIMING )
{
factory_ = auto_ptr<ApvTimingSummaryFactory>( new ApvTimingSummaryFactory );
factory_ = unique_ptr<ApvTimingSummaryFactory>( new ApvTimingSummaryFactory );
LogTrace(mlDqmClient_)
<< "[ApvTimingHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/CalibrationHistograms.cc
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ CalibrationHistograms::CalibrationHistograms( const edm::ParameterSet& pset,
<< "[CalibrationHistograms::" << __func__ << "]"
<< " Constructing object...";
std::string temp = std::string(sistrip::collate_) + "/" + sistrip::root_;
factory_ = auto_ptr<CalibrationSummaryFactory>( new CalibrationSummaryFactory );
factory_ = unique_ptr<CalibrationSummaryFactory>( new CalibrationSummaryFactory );
MonitorElement* calchanElement = bei->get(temp + "/calchan");
if(calchanElement) {
calchan_ = calchanElement->getIntValue();
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/DaqScopeModeHistograms.cc
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ DaqScopeModeHistograms::DaqScopeModeHistograms( const edm::ParameterSet& pset,
sistrip::DAQ_SCOPE_MODE )
{

factory_ = auto_ptr<DaqScopeModeSummaryFactory>( new DaqScopeModeSummaryFactory );
factory_ = unique_ptr<DaqScopeModeSummaryFactory>( new DaqScopeModeSummaryFactory );
LogTrace(mlDqmClient_)
<< "[DaqScopeModeHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/FastFedCablingHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ FastFedCablingHistograms::FastFedCablingHistograms( const edm::ParameterSet& pse
bei,
sistrip::FAST_CABLING )
{
factory_ = auto_ptr<FastFedCablingSummaryFactory>( new FastFedCablingSummaryFactory );
factory_ = unique_ptr<FastFedCablingSummaryFactory>( new FastFedCablingSummaryFactory );
LogTrace(mlDqmClient_)
<< "[FastFedCablingHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/NoiseHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ NoiseHistograms::NoiseHistograms( const edm::ParameterSet& pset,
bei,
sistrip::NOISE )
{
factory_ = auto_ptr<NoiseSummaryFactory>( new NoiseSummaryFactory );
factory_ = unique_ptr<NoiseSummaryFactory>( new NoiseSummaryFactory );
LogTrace(mlDqmClient_)
<< "[NoiseHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/OptoScanHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ OptoScanHistograms::OptoScanHistograms( const edm::ParameterSet& pset,
bei,
sistrip::OPTO_SCAN )
{
factory_ = auto_ptr<OptoScanSummaryFactory>( new OptoScanSummaryFactory );
factory_ = unique_ptr<OptoScanSummaryFactory>( new OptoScanSummaryFactory );
LogTrace(mlDqmClient_)
<< "[OptoScanHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/PedestalsHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ PedestalsHistograms::PedestalsHistograms( const edm::ParameterSet& pset,
bei,
sistrip::PEDESTALS )
{
factory_ = auto_ptr<PedestalsSummaryFactory>( new PedestalsSummaryFactory );
factory_ = unique_ptr<PedestalsSummaryFactory>( new PedestalsSummaryFactory );
LogTrace(mlDqmClient_)
<< "[PedestalsHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/PedsFullNoiseHistograms.cc
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ PedsFullNoiseHistograms::PedsFullNoiseHistograms( const edm::ParameterSet& pset,
sistrip::PEDS_FULL_NOISE )
{

factory_ = auto_ptr<PedsFullNoiseSummaryFactory>( new PedsFullNoiseSummaryFactory );
factory_ = unique_ptr<PedsFullNoiseSummaryFactory>( new PedsFullNoiseSummaryFactory );
LogTrace(mlDqmClient_)
<< "[PedsFullNoiseHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/PedsOnlyHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ PedsOnlyHistograms::PedsOnlyHistograms( const edm::ParameterSet& pset,
bei,
sistrip::PEDS_ONLY )
{
factory_ = auto_ptr<PedsOnlySummaryFactory>( new PedsOnlySummaryFactory );
factory_ = unique_ptr<PedsOnlySummaryFactory>( new PedsOnlySummaryFactory );
LogTrace(mlDqmClient_)
<< "[PedsOnlyHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/SamplingHistograms.cc
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ SamplingHistograms::SamplingHistograms( const edm::ParameterSet& pset,
LogTrace(mlDqmClient_)
<< "[SamplingHistograms::" << __func__ << "]"
<< " Constructing object...";
factory_ = auto_ptr<SamplingSummaryFactory>( new SamplingSummaryFactory );
factory_ = unique_ptr<SamplingSummaryFactory>( new SamplingSummaryFactory );
// retreive the latency code from the root file
std::string dataPath = std::string(sistrip::collate_) + "/" + sistrip::root_ + "/latencyCode";
MonitorElement* codeElement = bei->get(dataPath);
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommissioningClients/src/VpspScanHistograms.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ VpspScanHistograms::VpspScanHistograms( const edm::ParameterSet& pset,
bei,
sistrip::VPSP_SCAN )
{
factory_ = auto_ptr<VpspScanSummaryFactory>( new VpspScanSummaryFactory );
factory_ = unique_ptr<VpspScanSummaryFactory>( new VpspScanSummaryFactory );
LogTrace(mlDqmClient_)
<< "[VpspScanHistograms::" << __func__ << "]"
<< " Constructing object...";
Expand Down