Skip to content

Commit 66f3d2f

Browse files
committed
code review: use std::atomic.load() without explicit std::memory_order_acquire
1 parent 54da0a7 commit 66f3d2f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

L1Trigger/GlobalMuonTrigger/interface/L1MuGlobalMuonTrigger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class L1MuGlobalMuonTrigger : public edm::one::EDProducer<edm::one::SharedResour
100100
L1MuGMTReadoutRecord* currentReadoutRecord() const { return m_ReadoutRingbuffer.back(); };
101101

102102
/// for debug: return the debug block (in order to fill it)
103-
L1MuGMTDebugBlock* DebugBlockForFill() const { return m_db.load(std::memory_order_acquire).get(); };
103+
L1MuGMTDebugBlock* DebugBlockForFill() const { return m_db.load().get(); };
104104

105105
private:
106106
L1MuGMTPSB* m_PSB;

L1Trigger/GlobalMuonTrigger/src/L1MuGlobalMuonTrigger.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ L1MuGlobalMuonTrigger::L1MuGlobalMuonTrigger(const edm::ParameterSet& ps) {
7171
m_ExtendedCands.reserve(20);
7272

7373
// set configuration parameters
74-
if (!m_config.load(std::memory_order_acquire)) {
74+
if (!m_config.load()) {
7575
auto temp = std::make_shared<L1MuGMTConfig>(ps);
7676
std::shared_ptr<L1MuGMTConfig> expected = nullptr;
7777
m_config.compare_exchange_strong(expected, temp, std::memory_order_acq_rel, std::memory_order_acquire);
@@ -122,8 +122,8 @@ L1MuGlobalMuonTrigger::L1MuGlobalMuonTrigger(const edm::ParameterSet& ps) {
122122
edm::LogVerbatim("GMT_info") << "creating GMT Sorter";
123123
m_Sorter = new L1MuGMTSorter(*this); // barrel
124124

125-
if (!m_db.load(std::memory_order_acquire)) {
126-
auto config = m_config.load(std::memory_order_acquire);
125+
if (!m_db.load()) {
126+
auto config = m_config.load();
127127
auto temp = std::make_shared<L1MuGMTDebugBlock>(config->getBxMin(), config->getBxMax());
128128
std::shared_ptr<L1MuGMTDebugBlock> expected = nullptr;
129129
m_db.compare_exchange_strong(expected, temp, std::memory_order_acq_rel, std::memory_order_acquire);

0 commit comments

Comments
 (0)