Merge branch '21.9_warning_fix' into '21.9' (b76c9688) · Commits · atlas / athena

Commit b76c9688 authored 4 years ago by Nicholas Styles

Merge branch '21.9_warning_fix' into '21.9'

21.9 warning fix

See merge request atlas/athena!37755

parents 4f0e7ffb 01d65eb8

4 merge requests!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!39162Draft: Insert BCM' support,!3775521.9 warning fix

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/TRT_TrackTimingTool.cxx 4 additions, 1 deletion

...osmics/InDetCosmicsEventPhase/src/TRT_TrackTimingTool.cxx
InnerDetector/InDetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx 4 additions, 2 deletions

...DetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx
InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx 2 additions, 1 deletion

...DetTrackPRD_Association/src/InDetTrackPRD_Association.cxx
InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx 2 additions, 1 deletion

...cAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/TRT_TrackExtensionAlg.cxx 4 additions, 2 deletions

...cAlgs/TRT_TrackExtensionAlg/src/TRT_TrackExtensionAlg.cxx
InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx 1 addition, 1 deletion

...tRecTools/InDetSVWithMuonTool/src/InDetSVWithMuonTool.cxx
InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx 7 additions, 0 deletions

.../InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx 16 additions, 6 deletions

...ols/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx 2 additions, 2 deletions

...tor/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx 8 additions, 4 deletions

...T_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx 2 additions, 1 deletion

...ackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx 4 additions, 2 deletions

...T_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx 1 addition, 1 deletion

...RT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx 16 additions, 8 deletions

...Tools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsUtils_xk.h 9 additions, 4 deletions

...l_xk/TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsUtils_xk.h
InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx 4 additions, 2 deletions

...TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx
InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx 2 additions, 1 deletion

...kSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx
InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/LooseTrackVertexAssociationTool.cxx 2 additions, 10 deletions

...xAssociationTool/Root/LooseTrackVertexAssociationTool.cxx
InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TightTrackVertexAssociationTool.cxx 2 additions, 10 deletions

...xAssociationTool/Root/TightTrackVertexAssociationTool.cxx
InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/TrigConversionFinder.cxx 4 additions, 2 deletions

...gs/InDetTrigConversionFinder/src/TrigConversionFinder.cxx

with 96 additions and 61 deletions

Please register or to comment