From 57529964bf51bee1912d5ac3dcf1136001e28e3c Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Tue, 6 Dec 2022 11:20:19 +0100
Subject: [PATCH] Trk::Surfaces for now avoid hiding the uniqueClone
Trk::Surfaces for now avoid hiding the uniqueClone
---
Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.h | 2 --
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.icc | 6 ------
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.h | 1 -
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.icc | 5 -----
Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.h | 2 --
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.icc | 5 -----
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h | 3 ---
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.icc | 5 -----
Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.h | 3 ---
.../TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.icc | 5 -----
.../TrkSurfaces/TrkSurfaces/StraightLineSurface.h | 3 ---
.../TrkSurfaces/TrkSurfaces/StraightLineSurface.icc | 5 -----
12 files changed, 45 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.h
index d92a4f63435f..b5d3fc337e5e 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.h
@@ -104,8 +104,6 @@ public:
/**Implicit Constructor*/
virtual ConeSurface* clone() const override;
- std::unique_ptr<ConeSurface> uniqueClone() const;
-
/** Use the Surface as a ParametersBase constructor, from local parameters -
* charged */
virtual Surface::ChargedTrackParametersUniquePtr createUniqueTrackParameters(
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.icc
index 3b4e9598446e..43ceef6c2ad7 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.icc
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/ConeSurface.icc
@@ -47,12 +47,6 @@ ConeSurface::clone() const
return new ConeSurface(*this);
}
-inline std::unique_ptr<ConeSurface>
-ConeSurface::uniqueClone() const{
- return std::unique_ptr<ConeSurface>(clone());
-}
-
-
inline Amg::Vector3D
ConeSurface::normal(const Amg::Vector2D& lp) const
{
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.h
index 91d647a9474c..6e3d0b309bb2 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.h
@@ -120,7 +120,6 @@ public:
/**Implicit Constructor*/
virtual CylinderSurface* clone() const override;
- std::unique_ptr<CylinderSurface> uniqueClone() const;
/** Use the Surface as a ParametersBase constructor, from local parameters -
* charged */
virtual Surface::ChargedTrackParametersUniquePtr createUniqueTrackParameters(
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.icc
index f7d3a28a3f0d..d3cf6877a7d2 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.icc
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/CylinderSurface.icc
@@ -49,11 +49,6 @@ CylinderSurface::clone() const
return new CylinderSurface(*this);
}
-inline std::unique_ptr<CylinderSurface>
-CylinderSurface::uniqueClone() const{
- return std::unique_ptr<CylinderSurface>(clone());
-}
-
inline Amg::Vector3D
CylinderSurface::normal(const Amg::Vector2D& lp) const
{
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.h
index 4fd8fc337bec..b649f8f6b5d2 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.h
@@ -139,8 +139,6 @@ public:
/** Virtual constructor*/
virtual DiscSurface* clone() const override;
- std::unique_ptr<DiscSurface>uniqueClone() const;
-
/** Use the Surface as a ParametersBase constructor, from local parameters -
* charged */
virtual Surface::ChargedTrackParametersUniquePtr createUniqueTrackParameters(
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.icc
index 85152c4868ae..844ab3d5b75d 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.icc
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/DiscSurface.icc
@@ -46,11 +46,6 @@ DiscSurface::clone() const
return new DiscSurface(*this);
}
-inline std::unique_ptr<DiscSurface>
-DiscSurface::uniqueClone() const{
- return std::unique_ptr<DiscSurface>(clone());
-}
-
inline const SurfaceBounds&
DiscSurface::bounds() const
{
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h
index b8738938cbc8..23d44c642599 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.h
@@ -76,9 +76,6 @@ public:
/**Virtual constructor*/
virtual PerigeeSurface* clone() const override final;
- /** NVI unique_ptr method **/
- std::unique_ptr<PerigeeSurface> uniqueClone() const;
-
/**Equality operator*/
virtual bool operator==(const Surface& sf) const override;
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.icc
index b59c6f07464e..a3e93a6d8cca 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.icc
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PerigeeSurface.icc
@@ -48,11 +48,6 @@ PerigeeSurface::clone() const
return new PerigeeSurface(*this);
}
-inline std::unique_ptr<PerigeeSurface>
-PerigeeSurface::uniqueClone() const{
- return std::unique_ptr<PerigeeSurface>(clone());
-}
-
inline const Amg::Vector3D&
PerigeeSurface::normal() const
{
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.h
index 8b67feb8d26b..e91acf09c57f 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.h
@@ -162,9 +162,6 @@ public:
/**Virtual constructor*/
virtual PlaneSurface* clone() const override;
- /** NVI uniqueClone method */
- std::unique_ptr<PlaneSurface>uniqueClone() const;
-
/** Return the surface type */
virtual SurfaceType type() const override final;
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.icc
index 7c5e64cab7cb..bcc873f215ef 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.icc
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/PlaneSurface.icc
@@ -54,11 +54,6 @@ PlaneSurface::clone() const
return new PlaneSurface(*this);
}
-inline std::unique_ptr<PlaneSurface>
-PlaneSurface::uniqueClone() const{
- return std::unique_ptr<PlaneSurface>(clone());
-}
-
inline bool
PlaneSurface::insideBounds(const Amg::Vector2D& locpos,
double tol1,
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h
index 71b36b4043f1..c89833993384 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.h
@@ -95,9 +95,6 @@ public:
/** Implicit constructor*/
virtual StraightLineSurface* clone() const override final;
- /** NVI uniqueClone **/
- std::unique_ptr<StraightLineSurface> uniqueClone() const;
-
/** Use the Surface as a ParametersBase constructor, from local parameters -
* charged */
virtual Surface::ChargedTrackParametersUniquePtr createUniqueTrackParameters(
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.icc b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.icc
index 4a2c5191335e..5c6c39bdd982 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.icc
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/StraightLineSurface.icc
@@ -48,11 +48,6 @@ StraightLineSurface::clone() const
return new StraightLineSurface(*this);
}
-inline std::unique_ptr<StraightLineSurface>
-StraightLineSurface::uniqueClone() const{
- return std::unique_ptr<StraightLineSurface>(clone());
-}
-
inline const SurfaceBounds&
StraightLineSurface::bounds() const
{
--
GitLab