Skip to content

Commit

Permalink
Merge pull request #1532 from davidlt/clean-up-static-SiStripFecCabli…
Browse files Browse the repository at this point in the history
…ng.h

Multithreading fixes -- Make static a const in SiStripFecCabling::fecs()
  • Loading branch information
ktf committed Nov 24, 2013
2 parents ed267a7 + 85767e4 commit 2345875
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CalibFormats/SiStripObjects/interface/SiStripFecCabling.h
Expand Up @@ -79,7 +79,7 @@ const std::vector<SiStripFecCrate>& SiStripFecCabling::crates() const { return c

// TEMPORARY method to maintain backward compatibility!
const std::vector<SiStripFec>& SiStripFecCabling::fecs() const {
static std::vector<SiStripFec> my_fecs;
const static std::vector<SiStripFec> my_fecs;
if ( !crates_.empty() ) { return crates_[0].fecs(); }
else { return my_fecs; }
}
Expand Down

0 comments on commit 2345875

Please sign in to comment.