diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx
index e7a932b1687c008468f9bb4318ebbd41c45c31b1..54e8383e9bc2249f6aa10172b36d99c38e818b4e 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -37,10 +37,7 @@ MeasuredNeutralAtaSurfaceCnv_p1< SURFACE_CNV, ATA_SURFACE >::transToPers( const
-namespace {
- MeasuredNeutralAtaDiscCnv_p1 inst1;
- MeasuredNeutralAtaCylinderCnv_p1 inst2;
- MeasuredNeutralAtaPlaneCnv_p1 inst3;
- MeasuredNeutralAtaStraightLineCnv_p1 isnt4;
-}
-
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaDiscCnv_p1, Trk::NeutralAtaDisc >;
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaCylinderCnv_p1, Trk::NeutralAtaCylinder >;
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaPlaneCnv_p1, Trk::NeutralAtaPlane >;
+template class MeasuredNeutralAtaSurfaceCnv_p1< NeutralAtaStraightLineCnv_p1, Trk::NeutralAtaStraightLine >;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.cxx
index dcf98e38948673128b5b5c625be1ae75453ccb8d..aae3e783af9ed972ac5cc54d9f5701c508896698 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -15,10 +15,7 @@
#include "TrkEventTPCnv/TrkNeutralParameters/NeutralAtaSurfaceCnv_p1.icc"
-namespace {
- NeutralAtaDiscCnv_p1 inst1;
- NeutralAtaCylinderCnv_p1 inst2;
- NeutralAtaPlaneCnv_p1 inst3;
- NeutralAtaStraightLineCnv_p1 isnt4;
-}
-
+template class NeutralAtaSurfaceCnv_p1< DiscSurfaceCnv_p1, Trk::NeutralAtaDisc >;
+template class NeutralAtaSurfaceCnv_p1< CylinderSurfaceCnv_p1, Trk::NeutralAtaCylinder >;
+template class NeutralAtaSurfaceCnv_p1< PlaneSurfaceCnv_p1, Trk::NeutralAtaPlane >;
+template class NeutralAtaSurfaceCnv_p1< StraightLineSurfaceCnv_p1, Trk::NeutralAtaStraightLine >;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/AtaSurfaceCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/AtaSurfaceCnv_p1.cxx
index 3c64710f9bddbd8f1f965ae46aee764736ebda1c..e65a833640faf7043d90265e7a4788474c3b180b 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/AtaSurfaceCnv_p1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/AtaSurfaceCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -15,11 +15,8 @@
#include "TrkEventTPCnv/TrkParameters/AtaSurfaceCnv_p1.icc"
-namespace {
- AtaDiscCnv_p1 inst1;
- AtaCylinderCnv_p1 inst2;
- AtaPlaneCnv_p1 inst3;
- AtaStraightLineCnv_p1 isnt4;
- CurvilinearParametersCnv_p1 isnt5;
-}
-
+template class AtaSurfaceCnv_p1< DiscSurfaceCnv_p1, Trk::AtaDisc >;
+template class AtaSurfaceCnv_p1< CylinderSurfaceCnv_p1, Trk::AtaCylinder >;
+template class AtaSurfaceCnv_p1< PlaneSurfaceCnv_p1, Trk::AtaPlane >;
+template class AtaSurfaceCnv_p1< StraightLineSurfaceCnv_p1, Trk::AtaStraightLine >;
+template class AtaSurfaceCnv_p1< PlaneSurfaceCnv_p1, Trk::CurvilinearParameters >;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/MeasuredAtaSurfaceCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/MeasuredAtaSurfaceCnv_p1.cxx
index cf7ce6bebac49a807ec5f4aca39d7e0b06c04570..4fe816fd7af0a3ba06207ac7cb3901a8e8cb7c12 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/MeasuredAtaSurfaceCnv_p1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/MeasuredAtaSurfaceCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -36,11 +36,8 @@ MeasuredAtaSurfaceCnv_p1< SURFACE_CNV, ATA_SURFACE >::transToPers( const ATA_SUR
-namespace {
- MeasuredAtaDiscCnv_p1 inst1;
- MeasuredAtaCylinderCnv_p1 inst2;
- MeasuredAtaPlaneCnv_p1 inst3;
- MeasuredAtaStraightLineCnv_p1 isnt4;
- MeasuredCurvilinearParametersCnv_p1 isnt5;
-}
-
+template class MeasuredAtaSurfaceCnv_p1< AtaDiscCnv_p1, Trk::AtaDisc >;
+template class MeasuredAtaSurfaceCnv_p1< AtaCylinderCnv_p1, Trk::AtaCylinder >;
+template class MeasuredAtaSurfaceCnv_p1< AtaPlaneCnv_p1, Trk::AtaPlane >;
+template class MeasuredAtaSurfaceCnv_p1< AtaStraightLineCnv_p1, Trk::AtaStraightLine >;
+template class MeasuredAtaSurfaceCnv_p1< CurvilinearParametersCnv_p1, Trk::CurvilinearParameters >;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/BoundSurfaceCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/BoundSurfaceCnv_p1.cxx
index 539c4229ee12011ef4811423ebbf8a440a339242..6d84f904ffc90149706cb0cb8a1f50b9a6ff33a8 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/BoundSurfaceCnv_p1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/BoundSurfaceCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -93,10 +93,7 @@ transToPers( const SURFACE *transObj, Trk::BoundSurface_p1 *persObj, MsgStream &
}
-namespace {
- DiscSurfaceCnv_p1 inst1;
- CylinderSurfaceCnv_p1 inst2;
- PlaneSurfaceCnv_p1 inst3;
- StraightLineSurfaceCnv_p1 isnt4;
-}
-
+template class BoundSurfaceCnv_p1< Trk::DiscSurface, DiscBoundsCnv_p1 >;
+template class BoundSurfaceCnv_p1< Trk::CylinderSurface, CylinderBoundsCnv_p1 >;
+template class BoundSurfaceCnv_p1< Trk::StraightLineSurface, CylinderBoundsCnv_p1 >;
+template class BoundSurfaceCnv_p1< Trk::PlaneSurface >;
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/SurfaceCnv_p2.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/SurfaceCnv_p2.cxx
index 2115180b8ce5ea437e2e242f99088330055a4af6..c59b58ee6ee3a881167fb73a038c39fb8e7a3d3c 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/SurfaceCnv_p2.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkSurfaces/SurfaceCnv_p2.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -95,12 +95,10 @@ void SurfaceCnv_p2<Trk::SaggedLineSurface>::transToPers( const Trk::SaggedLineSu
}
}
-namespace {
- ConeSurfaceCnv_p2 inst1;
- CylinderSurfaceCnv_p2 inst2;
- DiscSurfaceCnv_p2 inst3;
- PerigeeSurfaceCnv_p2 inst4;
- PlaneSurfaceCnv_p2 inst5;
- StraightLineSurfaceCnv_p2 inst6;
- SaggedLineSurfaceCnv_p2 inst7;
-}
+template class SurfaceCnv_p2<Trk::ConeSurface>;
+template class SurfaceCnv_p2<Trk::CylinderSurface>;
+template class SurfaceCnv_p2<Trk::DiscSurface>;
+template class SurfaceCnv_p2<Trk::PerigeeSurface>;
+template class SurfaceCnv_p2<Trk::PlaneSurface>;
+template class SurfaceCnv_p2<Trk::StraightLineSurface>;
+template class SurfaceCnv_p2<Trk::SaggedLineSurface>;