Skip to content

Commit

Permalink
Merge pull request #3521 from ktf/revert-3504
Browse files Browse the repository at this point in the history
Revert "Made mutable in EventSetupRecord atomic"
  • Loading branch information
ktf committed Apr 26, 2014
2 parents 2612f3c + e01fed4 commit bad0c26
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions FWCore/Framework/interface/EventSetupRecord.h
Expand Up @@ -57,7 +57,6 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
// system include files
#include <map>
#include <vector>
#include <atomic>

// forward declarations
namespace cms {
Expand Down Expand Up @@ -213,7 +212,7 @@ namespace edm {
std::map<DataKey, DataProxy const*> proxies_ ;
EventSetup const* eventSetup_;
unsigned long long cacheIdentifier_;
mutable std::atomic<bool> transientAccessRequested_;
mutable bool transientAccessRequested_;
};
}
}
Expand Down

0 comments on commit bad0c26

Please sign in to comment.