Skip to content
Snippets Groups Projects
Commit eb2b31c4 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'cppcheck.TrkGeometry-20200928' into 'master'

TrkGeometry: Fix cppcheck warnings.

See merge request atlas/athena!36783
parents 4bfa0c42 0292761b
No related branches found
No related tags found
No related merge requests found
......@@ -410,10 +410,10 @@ namespace Trk {
void moveTV ATLAS_NOT_THREAD_SAFE(Amg::Transform3D& transform) const;
/** Forbidden copy constructor */
TrackingVolume(const TrackingVolume&): Volume(), Material() {}
TrackingVolume(const TrackingVolume&) = delete;
/** Forbid assignment. */
TrackingVolume &operator=(const TrackingVolume&) { return *this; }
TrackingVolume &operator=(const TrackingVolume&) = delete;
const TrackingVolume* m_motherVolume; //!< mother volume of this volume
......
......@@ -13,9 +13,9 @@ Trk::CompoundLayerMaterial::CompoundLayerMaterial() :
Trk::LayerMaterialProperties(),
m_materialProperties(new Trk::MaterialProperties()),
m_binUtility(nullptr),
m_fullComposition(false)
m_fullComposition(false),
m_elementTable (Trk::SharedObject<const Trk::ElementTable>(nullptr))
{
m_elementTable = Trk::SharedObject<const Trk::ElementTable>(nullptr);
}
Trk::CompoundLayerMaterial::CompoundLayerMaterial(const Trk::BinUtility& binutility,
......
......@@ -118,6 +118,7 @@ Trk::Layer& Trk::Layer::operator=(const Trk::Layer& lay)
if (this != &lay){
delete m_overlapDescriptor;
delete m_surfaceArray;
m_layerThickness = lay.m_layerThickness;
m_enclosingTrackingVolume = lay.m_enclosingTrackingVolume;
m_enclosingDetachedTrackingVolume = lay.m_enclosingDetachedTrackingVolume;
m_overlapDescriptor = (lay.m_overlapDescriptor) ? lay.m_overlapDescriptor->clone() : nullptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment