Skip to content

Commit

Permalink
Merge pull request #24646 from gartung/CommonTools-CandUtils-strictcxx17
Browse files Browse the repository at this point in the history 
CommonTools/CandUtils: remove template deprecated by std=c++17.
  • Loading branch information
@cmsbuild
cmsbuild committed Sep 28, 2018
2 parents 90d3b5a + 2b8e266 commit 46cfc89
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 69 deletions.
12 changes: 6 additions & 6 deletions CommonTools/CandUtils/interface/NamedCandCombinerBase.h
View file
Expand Up @@ -26,25 +26,25 @@ class NamedCandCombinerBase {
/// destructor
virtual ~NamedCandCombinerBase();
/// return all selected candidate pairs
std::auto_ptr<reco::NamedCompositeCandidateCollection>
std::unique_ptr<reco::NamedCompositeCandidateCollection>
combine(const std::vector<reco::CandidatePtrVector> &, string_coll const &) const;
/// return all selected candidate pairs
std::auto_ptr<reco::NamedCompositeCandidateCollection>
std::unique_ptr<reco::NamedCompositeCandidateCollection>
combine(const reco::CandidatePtrVector &,
string_coll const &) const;
/// return all selected candidate pairs
std::auto_ptr<reco::NamedCompositeCandidateCollection>
std::unique_ptr<reco::NamedCompositeCandidateCollection>
combine(const reco::CandidatePtrVector &,
const reco::CandidatePtrVector &,
string_coll const &) const;
/// return all selected candidate pairs
std::auto_ptr<reco::NamedCompositeCandidateCollection>
std::unique_ptr<reco::NamedCompositeCandidateCollection>
combine(const reco::CandidatePtrVector &,
const reco::CandidatePtrVector &,
const reco::CandidatePtrVector &,
string_coll const &) const;
/// return all selected candidate pairs
std::auto_ptr<reco::NamedCompositeCandidateCollection>
std::unique_ptr<reco::NamedCompositeCandidateCollection>
combine(const reco::CandidatePtrVector &,
const reco::CandidatePtrVector &,
const reco::CandidatePtrVector &,
Expand All @@ -69,7 +69,7 @@ class NamedCandCombinerBase {
string_coll const & names,
std::vector<reco::CandidatePtrVector>::const_iterator begin,
std::vector<reco::CandidatePtrVector>::const_iterator end,
std::auto_ptr<reco::NamedCompositeCandidateCollection> & comps
std::unique_ptr<reco::NamedCompositeCandidateCollection> & comps
) const;
/// select a candidate
virtual bool select(const reco::Candidate &) const = 0;
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/CandUtils/interface/cloneDecayTree.h
View file
Expand Up @@ -3,6 +3,6 @@
#include "DataFormats/Candidate/interface/CandidateFwd.h"
#include <memory>

std::auto_ptr<reco::Candidate> cloneDecayTree( const reco::Candidate & );
std::unique_ptr<reco::Candidate> cloneDecayTree( const reco::Candidate & );

#endif
30 changes: 15 additions & 15 deletions CommonTools/CandUtils/interface/makeCompositeCandidate.h
View file
Expand Up @@ -7,42 +7,42 @@

namespace helpers {
struct CompositeCandidateMaker {
CompositeCandidateMaker(std::auto_ptr<reco::CompositeCandidate> cmp) :
cmp_( cmp ) {
CompositeCandidateMaker(std::unique_ptr<reco::CompositeCandidate> cmp) :
cmp_( std::move(cmp) ) {
}
void addDaughter(const reco::Candidate & dau) {
cmp_->addDaughter( dau );
}
template<typename S>
std::auto_ptr<reco::Candidate> operator[]( const S & setup ) {
std::unique_ptr<reco::Candidate> operator[]( const S & setup ) {
setup.set( * cmp_ );
return release();
}
private:
std::auto_ptr<reco::CompositeCandidate> cmp_;
std::auto_ptr<reco::Candidate> release() {
std::auto_ptr<reco::Candidate> ret( cmp_.get() );
std::unique_ptr<reco::CompositeCandidate> cmp_;
std::unique_ptr<reco::Candidate> release() {
std::unique_ptr<reco::Candidate> ret( std::move(cmp_.get()) );
cmp_.release();
return ret;
return std::move(ret);
}
};

struct CompositePtrCandidateMaker {
CompositePtrCandidateMaker(std::auto_ptr<reco::CompositePtrCandidate> cmp) :
cmp_( cmp ) {
CompositePtrCandidateMaker(std::unique_ptr<reco::CompositePtrCandidate> cmp) :
cmp_( std::move(cmp) ) {
}
void addDaughter(const reco::CandidatePtr & dau) {
cmp_->addDaughter( dau );
}
template<typename S>
std::auto_ptr<reco::Candidate> operator[]( const S & setup ) {
std::unique_ptr<reco::Candidate> operator[]( const S & setup ) {
setup.set( * cmp_ );
return release();
}
private:
std::auto_ptr<reco::CompositePtrCandidate> cmp_;
std::auto_ptr<reco::Candidate> release() {
std::auto_ptr<reco::Candidate> ret( cmp_.get() );
std::unique_ptr<reco::CompositePtrCandidate> cmp_;
std::unique_ptr<reco::Candidate> release() {
std::unique_ptr<reco::Candidate> ret( cmp_.get() );
cmp_.release();
return ret;
}
Expand Down Expand Up @@ -75,7 +75,7 @@ helpers::CompositeCandidateMaker
makeCompositeCandidate(const typename C::const_iterator & begin,
const typename C::const_iterator & end) {
helpers::CompositeCandidateMaker
cmp(std::auto_ptr<reco::CompositeCandidate>(new reco::CompositeCandidate) );
cmp(std::unique_ptr<reco::CompositeCandidate>(new reco::CompositeCandidate) );
for(typename C::const_iterator i = begin; i != end; ++ i)
cmp.addDaughter(* i);
return cmp;
Expand All @@ -101,7 +101,7 @@ helpers::CompositeCandidateMaker
makeCompositeCandidateWithRefsToMaster(const typename C::const_iterator & begin,
const typename C::const_iterator & end) {
helpers::CompositeCandidateMaker
cmp(std::auto_ptr<reco::CompositeCandidate>(new reco::CompositeCandidate));
cmp(std::unique_ptr<reco::CompositeCandidate>(new reco::CompositeCandidate));
for(typename C::const_iterator i = begin; i != end; ++ i)
cmp.addDaughter(ShallowCloneCandidate(CandidateBaseRef(* i)));
return cmp;
Expand Down
18 changes: 9 additions & 9 deletions CommonTools/CandUtils/interface/makeNamedCompositeCandidate.h
View file
Expand Up @@ -7,21 +7,21 @@

namespace helpers {
struct NamedCompositeCandidateMaker {
NamedCompositeCandidateMaker( std::auto_ptr<reco::NamedCompositeCandidate> cmp ) :
cmp_( cmp ) {
}
NamedCompositeCandidateMaker( std::unique_ptr<reco::NamedCompositeCandidate> cmp ) :
cmp_(std::move(cmp)) {}

void addDaughter( const reco::Candidate & dau, std::string name ) {
cmp_->addDaughter( dau, name );
}
template<typename S>
std::auto_ptr<reco::Candidate> operator[]( const S & setup ) {
std::unique_ptr<reco::Candidate> operator[]( const S & setup ) {
setup.set( * cmp_ );
return release();
}
private:
std::auto_ptr<reco::NamedCompositeCandidate> cmp_;
std::auto_ptr<reco::Candidate> release() {
std::auto_ptr<reco::Candidate> ret( cmp_.get() );
std::unique_ptr<reco::NamedCompositeCandidate> cmp_;
std::unique_ptr<reco::Candidate> release() {
std::unique_ptr<reco::Candidate> ret( cmp_.get() );
cmp_.release();
return ret;
}
Expand Down Expand Up @@ -56,7 +56,7 @@ makeNamedCompositeCandidate( const typename C::const_iterator & begin,
const std::vector<std::string>::const_iterator sbegin,
const std::vector<std::string>::const_iterator send ) {
helpers::NamedCompositeCandidateMaker
cmp( std::auto_ptr<reco::NamedCompositeCandidate>( new reco::NamedCompositeCandidate ) );
cmp( std::unique_ptr<reco::NamedCompositeCandidate>( new reco::NamedCompositeCandidate ) );
std::vector<std::string>::const_iterator si = sbegin;
for( typename C::const_iterator i = begin; i != end && si != send; ++ i, ++si )
cmp.addDaughter( * i, * si );
Expand Down Expand Up @@ -85,7 +85,7 @@ makeNamedCompositeCandidateWithRefsToMaster( const typename C::const_iterator &
const std::vector<std::string>::const_iterator sbegin,
const std::vector<std::string>::const_iterator send ) {
helpers::NamedCompositeCandidateMaker
cmp( std::auto_ptr<reco::NamedCompositeCandidate>( new reco::NamedCompositeCandidate ) );
cmp( std::unique_ptr<reco::NamedCompositeCandidate>( new reco::NamedCompositeCandidate ) );
std::vector<std::string>::const_iterator si = sbegin;
for( typename C::const_iterator i = begin; i != end && si != send; ++ i, ++ si )
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( * i ) ), * si );
Expand Down
26 changes: 13 additions & 13 deletions CommonTools/CandUtils/src/NamedCandCombinerBase.cc
View file
Expand Up @@ -52,7 +52,7 @@ void NamedCandCombinerBase::combine(NamedCompositeCandidate & cmp, const Candida
setup(cmp);
}

auto_ptr<NamedCompositeCandidateCollection>
unique_ptr<NamedCompositeCandidateCollection>
NamedCandCombinerBase::combine(const vector<CandidatePtrVector> & src,
string_coll const & names) const {
size_t srcSize = src.size();
Expand All @@ -65,7 +65,7 @@ NamedCandCombinerBase::combine(const vector<CandidatePtrVector> & src,
throw edm::Exception(edm::errors::Configuration)
<< "NamedCandCombiner: need to add 2 names, but size is " << names.size();

auto_ptr<NamedCompositeCandidateCollection> comps(new NamedCompositeCandidateCollection);
unique_ptr<NamedCompositeCandidateCollection> comps(new NamedCompositeCandidateCollection);
if(srcSize == 2) {
CandidatePtrVector src1 = src[0], src2 = src[1];
if(src1 == src2) {
Expand Down Expand Up @@ -103,10 +103,10 @@ NamedCandCombinerBase::combine(const vector<CandidatePtrVector> & src,
combine(0, stack, qStack, names, src.begin(), src.end(), comps);
}

return comps;
return std::move(comps);
}

auto_ptr<NamedCompositeCandidateCollection>
unique_ptr<NamedCompositeCandidateCollection>
NamedCandCombinerBase::combine(const CandidatePtrVector & src, string_coll const & names) const {
if(checkCharge_ && dauCharge_.size() != 2)
throw edm::Exception(edm::errors::Configuration)
Expand All @@ -117,7 +117,7 @@ NamedCandCombinerBase::combine(const CandidatePtrVector & src, string_coll const
throw edm::Exception(edm::errors::Configuration)
<< "NamedCandCombiner: need to add 2 names, but size is " << names.size();

auto_ptr<NamedCompositeCandidateCollection> comps(new NamedCompositeCandidateCollection);
unique_ptr<NamedCompositeCandidateCollection> comps(new NamedCompositeCandidateCollection);
const int n = src.size();
for(int i1 = 0; i1 < n; ++i1) {
const Candidate & c1 = *(src[i1]);
Expand All @@ -132,28 +132,28 @@ NamedCandCombinerBase::combine(const CandidatePtrVector & src, string_coll const
}
}

return comps;
return std::move(comps);
}

auto_ptr<NamedCompositeCandidateCollection>
unique_ptr<NamedCompositeCandidateCollection>
NamedCandCombinerBase::combine(const CandidatePtrVector & src1, const CandidatePtrVector & src2, string_coll const & names) const {
vector<CandidatePtrVector> src;
src.push_back(src1);
src.push_back(src2);
return combine(src, names);
return std::move(combine(src, names));
}

auto_ptr<NamedCompositeCandidateCollection>
unique_ptr<NamedCompositeCandidateCollection>
NamedCandCombinerBase::combine(const CandidatePtrVector & src1, const CandidatePtrVector & src2, const CandidatePtrVector & src3,
string_coll const & names) const {
vector<CandidatePtrVector> src;
src.push_back(src1);
src.push_back(src2);
src.push_back(src3);
return combine(src, names);
return std::move(combine(src, names));
}

auto_ptr<NamedCompositeCandidateCollection>
unique_ptr<NamedCompositeCandidateCollection>
NamedCandCombinerBase::combine(const CandidatePtrVector & src1, const CandidatePtrVector & src2,
const CandidatePtrVector & src3, const CandidatePtrVector & src4,
string_coll const & names) const {
Expand All @@ -162,14 +162,14 @@ NamedCandCombinerBase::combine(const CandidatePtrVector & src1, const CandidateP
src.push_back(src2);
src.push_back(src3);
src.push_back(src4);
return combine(src, names);
return std::move(combine(src, names));
}

void NamedCandCombinerBase::combine(size_t collectionIndex, CandStack & stack, ChargeStack & qStack,
string_coll const & names,
vector<CandidatePtrVector>::const_iterator collBegin,
vector<CandidatePtrVector>::const_iterator collEnd,
auto_ptr<NamedCompositeCandidateCollection> & comps) const {
unique_ptr<NamedCompositeCandidateCollection> & comps) const {
if(collBegin == collEnd) {
static const int undetermined = 0, sameDecay = 1, conjDecay = -1, wrongDecay = 2;
int decayType = undetermined;
Expand Down
8 changes: 4 additions & 4 deletions CommonTools/CandUtils/src/cloneDecayTree.cc
View file
Expand Up @@ -3,14 +3,14 @@
using namespace std;
using namespace reco;

auto_ptr<Candidate> cloneDecayTree(const Candidate & c) {
unique_ptr<Candidate> cloneDecayTree(const Candidate & c) {
size_t n = c.numberOfDaughters();
if (n == 1) return auto_ptr<Candidate>(c.clone());
if (n == 1) return unique_ptr<Candidate>(c.clone());
// pass a particle, not a candidate, to avoid cloning daughters
const Candidate &p = c;
CompositeCandidate * cmp(new CompositeCandidate(p));
auto_ptr<Candidate> cmpPtr(cmp);
unique_ptr<Candidate> cmpPtr(cmp);
for(size_t i = 0; i < n; ++ i)
cmp->addDaughter(cloneDecayTree(* c.daughter(i)));
return cmpPtr;
return std::move(cmpPtr);
}
18 changes: 9 additions & 9 deletions CommonTools/CandUtils/src/makeCompositeCandidate.cc
View file
Expand Up @@ -3,15 +3,15 @@ using namespace reco;
using namespace std;

helpers::CompositeCandidateMaker makeCompositeCandidate( const Candidate & c1, const Candidate & c2 ) {
helpers::CompositeCandidateMaker cmp( auto_ptr<CompositeCandidate>( new CompositeCandidate ) );
helpers::CompositeCandidateMaker cmp( unique_ptr<CompositeCandidate>( new CompositeCandidate ) );
cmp.addDaughter( c1 );
cmp.addDaughter( c2 );
return cmp;
}

helpers::CompositeCandidateMaker makeCompositeCandidate( const Candidate & c1, const Candidate & c2,
const Candidate & c3 ) {
helpers::CompositeCandidateMaker cmp( auto_ptr<CompositeCandidate>( new CompositeCandidate ) );
helpers::CompositeCandidateMaker cmp( unique_ptr<CompositeCandidate>( new CompositeCandidate ) );
cmp.addDaughter( c1 );
cmp.addDaughter( c2 );
cmp.addDaughter( c3 );
Expand All @@ -20,7 +20,7 @@ helpers::CompositeCandidateMaker makeCompositeCandidate( const Candidate & c1, c

helpers::CompositeCandidateMaker makeCompositeCandidate( const Candidate & c1, const Candidate & c2,
const Candidate & c3,const Candidate & c4 ) {
helpers::CompositeCandidateMaker cmp( auto_ptr<CompositeCandidate>( new CompositeCandidate ) );
helpers::CompositeCandidateMaker cmp( unique_ptr<CompositeCandidate>( new CompositeCandidate ) );
cmp.addDaughter( c1 );
cmp.addDaughter( c2 );
cmp.addDaughter( c3 );
Expand All @@ -31,7 +31,7 @@ helpers::CompositeCandidateMaker makeCompositeCandidate( const Candidate & c1, c
helpers::CompositeCandidateMaker
makeCompositeCandidateWithRefsToMaster( const reco::CandidateRef & c1,
const reco::CandidateRef & c2 ) {
helpers::CompositeCandidateMaker cmp( auto_ptr<CompositeCandidate>( new CompositeCandidate ) );
helpers::CompositeCandidateMaker cmp( unique_ptr<CompositeCandidate>( new CompositeCandidate ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c1 ) ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c2 ) ) );
return cmp;
Expand All @@ -41,7 +41,7 @@ helpers::CompositeCandidateMaker
makeCompositeCandidateWithRefsToMaster( const reco::CandidateRef & c1,
const reco::CandidateRef & c2,
const reco::CandidateRef & c3 ) {
helpers::CompositeCandidateMaker cmp( auto_ptr<CompositeCandidate>( new CompositeCandidate ) );
helpers::CompositeCandidateMaker cmp( unique_ptr<CompositeCandidate>( new CompositeCandidate ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c1 ) ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c2 ) ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c3 ) ) );
Expand All @@ -53,7 +53,7 @@ makeCompositeCandidateWithRefsToMaster( const reco::CandidateRef & c1,
const reco::CandidateRef & c2,
const reco::CandidateRef & c3,
const reco::CandidateRef & c4 ) {
helpers::CompositeCandidateMaker cmp( auto_ptr<CompositeCandidate>( new CompositeCandidate ) );
helpers::CompositeCandidateMaker cmp( unique_ptr<CompositeCandidate>( new CompositeCandidate ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c1 ) ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c2 ) ) );
cmp.addDaughter( ShallowCloneCandidate( CandidateBaseRef( c3 ) ) );
Expand All @@ -62,15 +62,15 @@ makeCompositeCandidateWithRefsToMaster( const reco::CandidateRef & c1,
}

helpers::CompositePtrCandidateMaker makeCompositePtrCandidate( const CandidatePtr & c1, const CandidatePtr & c2 ) {
helpers::CompositePtrCandidateMaker cmp( auto_ptr<CompositePtrCandidate>( new CompositePtrCandidate ) );
helpers::CompositePtrCandidateMaker cmp( unique_ptr<CompositePtrCandidate>( new CompositePtrCandidate ) );
cmp.addDaughter( c1 );
cmp.addDaughter( c2 );
return cmp;
}

helpers::CompositePtrCandidateMaker makeCompositePtrCandidate( const CandidatePtr & c1, const CandidatePtr & c2,
const CandidatePtr & c3 ) {
helpers::CompositePtrCandidateMaker cmp( auto_ptr<CompositePtrCandidate>( new CompositePtrCandidate ) );
helpers::CompositePtrCandidateMaker cmp( unique_ptr<CompositePtrCandidate>( new CompositePtrCandidate ) );
cmp.addDaughter( c1 );
cmp.addDaughter( c2 );
cmp.addDaughter( c3 );
Expand All @@ -79,7 +79,7 @@ helpers::CompositePtrCandidateMaker makeCompositePtrCandidate( const CandidatePt

helpers::CompositePtrCandidateMaker makeCompositePtrCandidate( const CandidatePtr & c1, const CandidatePtr & c2,
const CandidatePtr & c3, const CandidatePtr & c4 ) {
helpers::CompositePtrCandidateMaker cmp( auto_ptr<CompositePtrCandidate>( new CompositePtrCandidate ) );
helpers::CompositePtrCandidateMaker cmp( unique_ptr<CompositePtrCandidate>( new CompositePtrCandidate ) );
cmp.addDaughter( c1 );
cmp.addDaughter( c2 );
cmp.addDaughter( c3 );
Expand Down

0 comments on commit 46cfc89

Please sign in to comment.