adding line that got dropped in by-hand merge
Merge pull request #4415 from gartung/clangSA-struct-std-atomic-safe

adding line that got dropped in by-hand merge
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X