Merge branch 'master' of https://github.com/meganz/mingw-std-threads

eswartz · Feb 17, 2015 · db6b62b · db6b62b
2 parents 886c4b1 + 5a3e56d
commit db6b62b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mingw.condition_variable.h b/mingw.condition_variable.h
@@ -19,9 +19,9 @@ class condition_variable_any
 {
 protected:
     recursive_mutex mMutex;
+    atomic<int> mNumWaiters;
     HANDLE mSemaphore;
     HANDLE mWakeEvent;
-    atomic<int> mNumWaiters;
 public:
     typedef HANDLE native_handle_type;
     native_handle_type native_handle() {return mSemaphore;}

diff --git a/mingw.mutex.h b/mingw.mutex.h
@@ -69,6 +69,7 @@ class _NonRecursiveMutex: protected B
 #endif
     }
 protected:
+#ifdef STDTHREAD_STRICT_NONRECURSIVE_LOCKS
     void checkSetOwnerAfterLock()
     {
         DWORD self = GetCurrentThreadId();
@@ -91,6 +92,7 @@ class _NonRecursiveMutex: protected B
         }
         mOwnerThread = 0;
     }
+#endif
 public:
     void unlock()
     {