From 04189b2b8041e7bf3f16f5e60a51124c22588c53 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 1 Jul 2020 02:44:03 +0100
Subject: [PATCH] add final to MeasurementBaseType checking methods
---
.../TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h | 3 ++-
Tracking/TrkEvent/TrkSegment/TrkSegment/Segment.h | 3 ++-
.../TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePoint.h | 7 ++++---
.../TrkVertexOnTrack/TrkVertexOnTrack/VertexOnTrack.h | 8 ++++----
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h b/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h
index a2ee9dc0398..042cb3a2fb3 100755
--- a/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h
+++ b/Tracking/TrkEvent/TrkCompetingRIOsOnTrack/TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h
@@ -107,7 +107,8 @@ public:
virtual void setLocalParametersAndErrorMatrix();
/** Extended method checking the type*/
- virtual bool type(MeasurementBaseType::Type type) const override{
+ virtual bool type(MeasurementBaseType::Type type) const override final
+ {
return (type==MeasurementBaseType::CompetingRIOsOnTrack);
}
diff --git a/Tracking/TrkEvent/TrkSegment/TrkSegment/Segment.h b/Tracking/TrkEvent/TrkSegment/TrkSegment/Segment.h
index 615a068fea0..c3fdb11539b 100755
--- a/Tracking/TrkEvent/TrkSegment/TrkSegment/Segment.h
+++ b/Tracking/TrkEvent/TrkSegment/TrkSegment/Segment.h
@@ -98,7 +98,8 @@ class FitQuality;
virtual Segment* clone() const override = 0;
/** Extended method checking the type*/
- virtual bool type(MeasurementBaseType::Type type) const override {
+ virtual bool type(MeasurementBaseType::Type type) const override final
+ {
return (type==MeasurementBaseType::Segment);
}
diff --git a/Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePoint.h b/Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePoint.h
index b299db70c05..b9c120e2cb2 100755
--- a/Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePoint.h
+++ b/Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePoint.h
@@ -69,16 +69,17 @@ namespace Trk{
double phi() const ;
/**Interface method to get the associated Surface*/
- virtual const Surface& associatedSurface() const override;
+ virtual const Surface& associatedSurface() const override final;
/**Interface method to get the global Position*/
- virtual const Amg::Vector3D& globalPosition() const override;
+ virtual const Amg::Vector3D& globalPosition() const override final;
/** Clone */
virtual SpacePoint* clone() const override = 0;
/** Extended method checking the type*/
- virtual bool type(MeasurementBaseType::Type type) const override {
+ virtual bool type(MeasurementBaseType::Type type) const override final
+ {
return (type==MeasurementBaseType::SpacePoint);
}
diff --git a/Tracking/TrkEvent/TrkVertexOnTrack/TrkVertexOnTrack/VertexOnTrack.h b/Tracking/TrkEvent/TrkVertexOnTrack/TrkVertexOnTrack/VertexOnTrack.h
index 5513804ae71..2e43e2cf55b 100755
--- a/Tracking/TrkEvent/TrkVertexOnTrack/TrkVertexOnTrack/VertexOnTrack.h
+++ b/Tracking/TrkEvent/TrkVertexOnTrack/TrkVertexOnTrack/VertexOnTrack.h
@@ -69,18 +69,18 @@ namespace Trk{
/** returns the surface for the local to global transformation
- interface from MeasurementBase */
- virtual const PerigeeSurface& associatedSurface() const override;
+ virtual const PerigeeSurface& associatedSurface() const override final;
/**Interface method to get the global Position
- interface from MeasurementBase */
- virtual const Amg::Vector3D& globalPosition() const override;
+ virtual const Amg::Vector3D& globalPosition() const override final;
/** Extended method checking the type*/
- virtual bool type(MeasurementBaseType::Type type) const override {
+ virtual bool type(MeasurementBaseType::Type type) const override final
+ {
return (type==MeasurementBaseType::VertexOnTrack);
}
-
/**returns the some information about this VertexOnTrack. */
virtual MsgStream& dump( MsgStream& out ) const override;
/**returns the some information about this VertexOnTrack. */
--
GitLab