Skip to content
Snippets Groups Projects
Commit 701b3909 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (TrkSpacePoint-05-00-04)

	* attempt to fix
12423 09/07/2014 (Low) Missing assignment operator :/Tracking/TrkEvent/TrkSpacePoint/src/SpacePoint.cxx in function "operator ="
  	* tag as 	TrkSpacePoint-05-00-04
parent d89a1a35
No related branches found
No related tags found
No related merge requests found
################################################################################
# Package: TrkSpacePoint
################################################################################
# Declare the package name:
atlas_subdir( TrkSpacePoint )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/DataModel
Control/SGTools
DetectorDescription/Identifier
Event/EventContainers
GaudiKernel
Tracking/TrkEvent/TrkMeasurementBase
PRIVATE
Tracking/TrkDetDescr/TrkDetElementBase
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkPrepRawData )
# Component(s) in the package:
atlas_add_library( TrkSpacePoint
src/*.cxx
PUBLIC_HEADERS TrkSpacePoint
LINK_LIBRARIES DataModel SGTools Identifier GaudiKernel TrkMeasurementBase
PRIVATE_LINK_LIBRARIES TrkDetElementBase TrkSurfaces TrkEventPrimitives TrkPrepRawData )
...@@ -58,7 +58,11 @@ namespace Trk ...@@ -58,7 +58,11 @@ namespace Trk
{ {
m_elemIdList = SP.m_elemIdList; m_elemIdList = SP.m_elemIdList;
m_position = SP.m_position; m_position = SP.m_position;
m_clusList = new std::pair<const PrepRawData*, const PrepRawData*>(*SP.m_clusList); if (SP.m_clusList){
m_clusList = new std::pair<const PrepRawData*, const PrepRawData*>(*SP.m_clusList);
} else {
m_clusList=nullptr;
}
m_globalCovariance = SP.m_globalCovariance; m_globalCovariance = SP.m_globalCovariance;
#ifndef NDEBUG #ifndef NDEBUG
s_numberOfInstantiations++; // new SpacePoint, so increment total count s_numberOfInstantiations++; // new SpacePoint, so increment total count
...@@ -71,14 +75,18 @@ namespace Trk ...@@ -71,14 +75,18 @@ namespace Trk
SpacePoint& SpacePoint::operator=(const SpacePoint& SP) SpacePoint& SpacePoint::operator=(const SpacePoint& SP)
{ {
if (&SP !=this) if (&SP !=this)
{ {
Trk::MeasurementBase::operator=(SP); Trk::MeasurementBase::operator=(SP);
delete m_clusList; delete m_clusList;
m_elemIdList = SP.m_elemIdList; m_elemIdList = SP.m_elemIdList;
m_position = SP.m_position; m_position = SP.m_position;
m_clusList = new std::pair<const PrepRawData*, const PrepRawData*>(*SP.m_clusList); if (SP.m_clusList){
m_globalCovariance = SP.m_globalCovariance; m_clusList = new std::pair<const PrepRawData*, const PrepRawData*>(*SP.m_clusList);
} } else {
m_clusList=nullptr;
}
m_globalCovariance = SP.m_globalCovariance;
}
return *this; return *this;
} }
......
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