mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-30 02:31:44 +00:00
Replace std::lock_guard and std::lock with std::scoped_lock (#1758)
std::scoped_lock was introduced in C++17 and is strictly better than std::lock_guard as it supports locking any number of mutexes safely. It's also easier to use than std::lock for locking multiple mutexes at once.
This commit is contained in:
committed by
Peter Johnson
parent
24d31df55a
commit
62be0392b6
@@ -548,9 +548,7 @@ public:
|
||||
}
|
||||
|
||||
SignalBase & operator=(SignalBase && o) {
|
||||
lock_type lock1(m_mutex, std::defer_lock);
|
||||
lock_type lock2(o.m_mutex, std::defer_lock);
|
||||
std::lock(lock1, lock2);
|
||||
std::scoped_lock lock(m_mutex, o.m_mutex);
|
||||
|
||||
std::swap(m_func, o.m_func);
|
||||
m_block.store(o.m_block.exchange(m_block.load()));
|
||||
|
||||
Reference in New Issue
Block a user