Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SafeThread bad merge. (#53)

Browse Source
This commit is contained in:
Peter Johnson
2017-11-12 23:00:50 -08:00
committed by GitHub
parent 80618a2e64
commit e4deda5ccb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/native/include/support/SafeThread.h
View File

@@ -35,7 +35,7 @@ class SafeThreadProxyBase {
public:
SafeThreadProxyBase(SafeThread* thr) : m_thread(thr) {
if (!m_thread) return;
m_lock = std::unique_lock<std::mutex>(m_thread->m_mutex);
m_lock = std::unique_lock<wpi::mutex>(m_thread->m_mutex);
if (!m_thread->m_active) {
m_lock.unlock();
m_thread = nullptr;