From 4fad7f412f53f090a9b9b64fad4cd4c1882d45a3 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Fri, 24 May 2019 17:08:07 +0100
Subject: [PATCH] Remaining SharedObject addRef,remRef after aliasing to
shared_ptr
---
.../TrkVolumes/TrkVolumes/BoundaryCylinderSurface.icc | 2 --
.../TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryDiscSurface.icc | 2 --
.../TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryPlaneSurface.icc | 2 --
.../TrkVolumes/TrkVolumes/BoundarySubtractedPlaneSurface.icc | 2 --
Tracking/TrkDetDescr/TrkVolumes/src/CombinedVolumeBounds.cxx | 2 --
Tracking/TrkDetDescr/TrkVolumes/src/SubtractedVolumeBounds.cxx | 2 --
6 files changed, 12 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryCylinderSurface.icc b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryCylinderSurface.icc
index 9b71e3d3baf..a2910391303 100755
--- a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryCylinderSurface.icc
+++ b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryCylinderSurface.icc
@@ -12,8 +12,6 @@ template <class Tvol> inline BoundaryCylinderSurface<Tvol>&
if (this!=&bcs){
delete BoundarySurface<Tvol>::m_insideVolume;
delete BoundarySurface<Tvol>::m_outsideVolume;
- BoundarySurface<Tvol>::m_insideVolumeArray.remRef();
- BoundarySurface<Tvol>::m_outsideVolumeArray.remRef();
delete Surface::m_transform;
delete Surface::m_center;
delete Surface::m_normal;
diff --git a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryDiscSurface.icc b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryDiscSurface.icc
index e2ad907ea3a..17dd83d8939 100755
--- a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryDiscSurface.icc
+++ b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryDiscSurface.icc
@@ -13,8 +13,6 @@ template <class Tvol> inline BoundaryDiscSurface<Tvol>&
if (this!=&bds){
delete BoundarySurface<Tvol>::m_insideVolume;
delete BoundarySurface<Tvol>::m_outsideVolume;
- BoundarySurface<Tvol>::m_insideVolumeArray.remRef();
- BoundarySurface<Tvol>::m_outsideVolumeArray.remRef();
delete Surface::m_transform;
delete Surface::m_center;
delete Surface::m_normal;
diff --git a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryPlaneSurface.icc b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryPlaneSurface.icc
index 5e978ec7abd..e69b347315e 100755
--- a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryPlaneSurface.icc
+++ b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundaryPlaneSurface.icc
@@ -13,8 +13,6 @@ template <class Tvol> inline BoundaryPlaneSurface<Tvol>&
if (this!=&bps){
delete BoundarySurface<Tvol>::m_insideVolume;
delete BoundarySurface<Tvol>::m_outsideVolume;
- BoundarySurface<Tvol>::m_insideVolumeArray.remRef();
- BoundarySurface<Tvol>::m_outsideVolumeArray.remRef();
delete Surface::m_transform;
delete Surface::m_center;
delete Surface::m_normal;
diff --git a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundarySubtractedPlaneSurface.icc b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundarySubtractedPlaneSurface.icc
index e90b9adaf83..66e7a08fc2b 100755
--- a/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundarySubtractedPlaneSurface.icc
+++ b/Tracking/TrkDetDescr/TrkVolumes/TrkVolumes/BoundarySubtractedPlaneSurface.icc
@@ -13,8 +13,6 @@ template <class Tvol> inline BoundarySubtractedPlaneSurface<Tvol>&
if (this!=&bps){
delete BoundarySurface<Tvol>::m_insideVolume;
delete BoundarySurface<Tvol>::m_outsideVolume;
- BoundarySurface<Tvol>::m_insideVolumeArray.remRef();
- BoundarySurface<Tvol>::m_outsideVolumeArray.remRef();
delete Surface::m_transform;
delete Surface::m_center;
delete Surface::m_normal;
diff --git a/Tracking/TrkDetDescr/TrkVolumes/src/CombinedVolumeBounds.cxx b/Tracking/TrkDetDescr/TrkVolumes/src/CombinedVolumeBounds.cxx
index b812f0b9818..d46171c7865 100755
--- a/Tracking/TrkDetDescr/TrkVolumes/src/CombinedVolumeBounds.cxx
+++ b/Tracking/TrkDetDescr/TrkVolumes/src/CombinedVolumeBounds.cxx
@@ -128,7 +128,6 @@ const std::vector<const Trk::Surface*>* Trk::CombinedVolumeBounds::decomposeToSu
vEx = sclo->subtractedVolume();
shared = sclo->shared();
}
- //vEx.addRef();
const Trk::VolumeExcluder* volExcl = dynamic_cast<const Trk::VolumeExcluder*> (vEx.get());
if (!volExcl) throw std::logic_error("Not a VolumeExcluder");
@@ -198,7 +197,6 @@ const std::vector<const Trk::Surface*>* Trk::CombinedVolumeBounds::decomposeToSu
vEx = scli->subtractedVolume();
shared = scli->shared();
}
- //vEx.addRef();
const Trk::VolumeExcluder* volExcl = dynamic_cast<const Trk::VolumeExcluder*> (vEx.get());
if (!volExcl) throw std::logic_error("Not a VolumeExcluder");
Trk::Volume* secondSub = new Trk::Volume(*volExcl->volume());
diff --git a/Tracking/TrkDetDescr/TrkVolumes/src/SubtractedVolumeBounds.cxx b/Tracking/TrkDetDescr/TrkVolumes/src/SubtractedVolumeBounds.cxx
index 18f5285f5a9..79cb6d7c44f 100755
--- a/Tracking/TrkDetDescr/TrkVolumes/src/SubtractedVolumeBounds.cxx
+++ b/Tracking/TrkDetDescr/TrkVolumes/src/SubtractedVolumeBounds.cxx
@@ -124,7 +124,6 @@ const std::vector<const Trk::Surface*>* Trk::SubtractedVolumeBounds::decomposeTo
vEx = sclo->subtractedVolume();
shared = sclo->shared();
}
- //vEx.addRef();
const Trk::VolumeExcluder* volExcl = dynamic_cast<const Trk::VolumeExcluder*> (vEx.get());
if (!volExcl) throw std::logic_error("Not a VolumeExcluder");
Trk::Volume* outerSub = new Trk::Volume(*volExcl->volume());
@@ -187,7 +186,6 @@ const std::vector<const Trk::Surface*>* Trk::SubtractedVolumeBounds::decomposeTo
vEx = scli->subtractedVolume();
shared = scli->shared();
}
- //vEx.addRef();
const Trk::VolumeExcluder* volExcl = dynamic_cast<const Trk::VolumeExcluder*> (vEx.get());
if (!volExcl) throw std::logic_error("Not a VolumeExcluder");
Trk::Volume* innerSub = new Trk::Volume(*volExcl->volume());
--
GitLab