From e4deda5ccb72b3adb20a468c50915185422788a7 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 12 Nov 2017 23:00:50 -0800
Subject: [PATCH] Fix SafeThread bad merge. (#53)

---
 src/main/native/include/support/SafeThread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/native/include/support/SafeThread.h b/src/main/native/include/support/SafeThread.h
index dfde804595..e0d357a50d 100644
--- a/src/main/native/include/support/SafeThread.h
+++ b/src/main/native/include/support/SafeThread.h
@@ -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;