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

Fix hidden overloaded member function clang warning #24226

Merged
merged 1 commit into from Aug 8, 2018
Merged

Fix hidden overloaded member function clang warning #24226

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 DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h
View file
Open in desktop
Expand Up @@ -173,7 +173,7 @@ class FastTrackerRecHit : public BaseTrackerRecHit

protected:

FastTrackerRecHit * clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
FastTrackerRecHit * clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return this->clone();
}

Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h
View file
Open in desktop
Expand Up @@ -37,10 +37,10 @@ class Phase2TrackerRecHit1D final : public TrackerSingleRecHit {

private:
// double dispatch
Phase2TrackerRecHit1D * clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
Phase2TrackerRecHit1D * clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner(*this,tsos).release();
}
RecHitPointer cloneSH(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
RecHitPointer cloneSH_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner.makeShared(*this,tsos);
}
};
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h
View file
Open in desktop
Expand Up @@ -73,11 +73,11 @@ class ProjectedSiStripRecHit2D final : public TrackerSingleRecHit {

private:
// double dispatch
ProjectedSiStripRecHit2D * clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
ProjectedSiStripRecHit2D * clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner(*this,tsos).release();
}
#ifndef __GCCXML__
ConstRecHitPointer cloneSH(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
ConstRecHitPointer cloneSH_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner.makeShared(*this,tsos);
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h
View file
Open in desktop
Expand Up @@ -57,11 +57,11 @@ class SiPixelRecHit final : public TrackerSingleRecHit {
bool canImproveWithTrack() const override {return true;}
private:
// double dispatch
SiPixelRecHit * clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
SiPixelRecHit * clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner(*this,tsos).release();
}
#ifndef __GCCXML__
RecHitPointer cloneSH(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
RecHitPointer cloneSH_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner.makeShared(*this,tsos);
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h
View file
Open in desktop
Expand Up @@ -63,11 +63,11 @@ class SiStripMatchedRecHit2D final : public BaseTrackerRecHit {
bool canImproveWithTrack() const override {return true;}
private:
// double dispatch
SiStripMatchedRecHit2D * clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
SiStripMatchedRecHit2D * clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner(*this,tsos).release();
}
#ifndef __GCCXML__
RecHitPointer cloneSH(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
RecHitPointer cloneSH_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner.makeShared(*this,tsos);
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h
View file
Open in desktop
Expand Up @@ -39,11 +39,11 @@ class SiStripRecHit1D final : public TrackerSingleRecHit {
bool canImproveWithTrack() const override {return true;}
private:
// double dispatch
SiStripRecHit1D * clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
SiStripRecHit1D * clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner(*this,tsos).release();
}
#ifndef __GCCXML__
RecHitPointer cloneSH(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
RecHitPointer cloneSH_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner.makeShared(*this,tsos);
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h
View file
Open in desktop
Expand Up @@ -40,11 +40,11 @@ class SiStripRecHit2D final : public TrackerSingleRecHit {
bool canImproveWithTrack() const override {return true;}
private:
// double dispatch
SiStripRecHit2D* clone(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
SiStripRecHit2D* clone_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner(*this,tsos).release();
}
#ifndef __GCCXML__
RecHitPointer cloneSH(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
RecHitPointer cloneSH_(TkCloner const& cloner, TrajectoryStateOnSurface const& tsos) const override {
return cloner.makeShared(*this,tsos);
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/TkCloner.h
View file
Open in desktop
Expand Up @@ -15,13 +15,13 @@ class Phase2TrackerRecHit1D;
class TkCloner {
public:
TrackingRecHit * operator() CMS_THREAD_SAFE (TrackingRecHit const & hit, TrajectoryStateOnSurface const& tsos) const {
return hit.clone(*this, tsos);
return hit.clone_(*this, tsos);
}

virtual ~TkCloner() {}
#ifndef __GCCXML__
TrackingRecHit::ConstRecHitPointer makeShared(TrackingRecHit::ConstRecHitPointer const & hit, TrajectoryStateOnSurface const& tsos) const {
return hit->canImproveWithTrack() ? hit->cloneSH(*this, tsos) : hit;
return hit->canImproveWithTrack() ? hit->cloneSH_(*this, tsos) : hit;
// return hit->cloneSH(*this, tsos);
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/TrackingRecHit/interface/TrackingRecHit.h
View file
Open in desktop
Expand Up @@ -167,12 +167,12 @@ class TrackingRecHit {
private:
friend class TkCloner;
// double dispatch
virtual TrackingRecHit * clone(TkCloner const&, TrajectoryStateOnSurface const&) const {
virtual TrackingRecHit * clone_(TkCloner const&, TrajectoryStateOnSurface const&) const {
assert("clone"==nullptr);
return clone(); // default
}
#ifndef __GCCXML__
virtual RecHitPointer cloneSH(TkCloner const&, TrajectoryStateOnSurface const&) const {
virtual RecHitPointer cloneSH_(TkCloner const&, TrajectoryStateOnSurface const&) const {
assert("cloneSH"==nullptr);
return cloneSH(); // default
}
Expand Down