Merge branch 'thread.PileUpTools-20220112' into 'master' (e3e26fd0) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

e3e26fd0

Commit e3e26fd0 authored 3 years ago by Edward Moyse

Downloads
- Plain Diff

Merge branch 'thread.PileUpTools-20220112' into 'master'

PileUpTools: Enable thread-safety checkin.g

See merge request !49615

parents 13738b3e d3cd2648

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Control/PileUpTools/CMakeLists.txt 1 addition, 1 deletion

Control/PileUpTools/CMakeLists.txt
Control/PileUpTools/PileUpTools/ATLAS_CHECK_THREAD_SAFETY 1 addition, 0 deletions

Control/PileUpTools/PileUpTools/ATLAS_CHECK_THREAD_SAFETY
Control/PileUpTools/PileUpTools/PileUpMergeSvc.h 3 additions, 2 deletions

Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
Control/PileUpTools/PileUpTools/PileUpStream.h 12 additions, 14 deletions

Control/PileUpTools/PileUpTools/PileUpStream.h
Control/PileUpTools/src/PileUpMergeSvc.cxx 13 additions, 21 deletions

Control/PileUpTools/src/PileUpMergeSvc.cxx
Control/PileUpTools/src/PileUpStream.cxx 12 additions, 9 deletions

Control/PileUpTools/src/PileUpStream.cxx

with 42 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment