Christos Anastopoulos authored 5 years ago and Adam Edward Barton committed 5 years ago

binary_function deprecated / to be removed https://en.cppreference.com/w/cpp/utility/functional/binary_function

Susumu Oda authored 5 years ago and Adam Edward Barton committed 5 years ago

Original TrackSummary is copied if TrackSummaryTool is not found and TrackSummary is available. if-else style is unified in a part of the code.

Scott Snyder authored 5 years ago and Adam Edward Barton committed 5 years ago

Add const interfaces to IPRD_AssociationTool; instead of keeping
the tool state internally, these pass the state explicitly
as an additional argument.  The existing interfaces are retained
for now for backwards compatibility.

This is to allow fixing some violations of ToolHandle constness rules.

clang warnings: missing override keywords.

Scott Snyder authored 5 years ago and Adam Edward Barton committed 5 years ago

This reverts commit 9a528fc6.

This reverts merge request !23378

This reverts merge request !23378

Fixes for unchecked SC as mentioned in ATLASRECTS-4931. Also did a bit of cleanup of the code to make it a little more readable.

This will enable the ATLAS GCC plugin to check for thread safety issues
in the GlobalChi2Fitter. As far as I can tell, this should complete
without warnings at this time.

I wasn't entirely sure whether the previous solution (an `std::array` of
`std::atomic` values) was actually thread safe, so I've replaced it by a
more robust explicitly locked solution. In any case, the old
implementation was plagued by the lack of move semantics of atomics,
which made having them in an array somewhat awkward.

Make mergeTrack() non-const, to avoid calling a non-const method through
a const ToolHandle.