Commit caa5cc30 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (InDetServMatGeoModel-00-04-32)

	* Fix for ATLASSIM-1935
	* Tagged as InDetServMatGeoModel-00-04-32

2015-03-22 Nick Styles
	* Fix for coverity 11697 (memory leak)
	* Tagged as  InDetServMatGeoModel-00-04-31
parent 041dfcd0
################################################################################
# Package: InDetServMatGeoModel
################################################################################
# Declare the package name:
atlas_subdir( InDetServMatGeoModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
Database/AthenaPOOL/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
GaudiKernel
InnerDetector/InDetDetDescr/InDetGeoModelUtils
PRIVATE
Control/CLIDSvc
Control/SGTools
Control/StoreGate
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeometryDBSvc )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
# Component(s) in the package:
atlas_add_component( InDetServMatGeoModel
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GeoModelKernel GeoModelUtilities GaudiKernel InDetGeoModelUtils SGTools StoreGateLib SGtests )
# Install files from the package:
atlas_install_headers( InDetServMatGeoModel )
......@@ -208,7 +208,7 @@ void InDetServMatBuilderToolSLHC::addServiceVolume( const ServiceVolume& vol)
<< " with " << vol.materials().size() << " materials" << endreq;
InDetDD::ServiceVolume * param = new InDetDD::ServiceVolume;
// std::unique_ptr<InDetDD::ServiceVolume> param( new InDetDD::ServiceVolume);
//std::unique_ptr<InDetDD::ServiceVolume> param (new InDetDD::ServiceVolume); This doesn't work for some reason...
std::vector<std::string> linearComponents;
std::vector<double> linWeights;
......@@ -253,6 +253,7 @@ void InDetServMatBuilderToolSLHC::addServiceVolume( const ServiceVolume& vol)
addService(param);
// addService(param.release());
}
else delete param;
}
std::string InDetServMatBuilderToolSLHC::addPrefix( const std::string& prefix, const std::string& name) const
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment