switch mutex to be based on std::mutex when available

AcademySoftwareFoundation · Aug 8, 2018 · 848c8c3 · 848c8c3
1 parent eea1e60
commit 848c8c3
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 24 deletions.
diff --git a/IlmBase/IlmThread/IlmThreadForward.h b/IlmBase/IlmThread/IlmThreadForward.h
@@ -37,10 +37,18 @@
 
 #include "IlmThreadNamespace.h"
 
+#ifndef ILMBASE_FORCE_CXX03
+namespace std { class mutex; }
+#endif
+
 ILMTHREAD_INTERNAL_NAMESPACE_HEADER_ENTER
 
 class Thread;
+#ifdef ILMBASE_FORCE_CXX03
 class Mutex;
+#else
+using Mutex = std::mutex;
+#endif
 class Lock;
 class ThreadPool;
 class Task;

diff --git a/IlmBase/IlmThread/IlmThreadMutex.cpp b/IlmBase/IlmThread/IlmThreadMutex.cpp
@@ -41,9 +41,9 @@
 
 #include "IlmBaseConfig.h"
 
-#if !defined (_WIN32) && !(_WIN64) && !(HAVE_PTHREAD)
-
-#include "IlmThreadMutex.h"
+#ifdef ILMBASE_FORCE_CXX03
+#   if !defined (_WIN32) && !(_WIN64) && !(HAVE_PTHREAD)
+#      include "IlmThreadMutex.h"
 
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_ENTER
 
@@ -56,4 +56,5 @@ void Mutex::unlock () const {}
 
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_EXIT
 
+#   endif
 #endif
diff --git a/IlmBase/IlmThread/IlmThreadMutex.h b/IlmBase/IlmThread/IlmThreadMutex.h
@@ -70,20 +70,39 @@
 #include "IlmBaseConfig.h"
 #include "IlmThreadNamespace.h"
 
-#if defined _WIN32 || defined _WIN64
-    #ifdef NOMINMAX
-        #undef NOMINMAX
-    #endif
-    #define NOMINMAX
-    #include <windows.h>
-#elif HAVE_PTHREAD
-    #include <pthread.h>
+#ifdef ILMBASE_FORCE_CXX03
+#   if defined _WIN32 || defined _WIN64
+#      ifdef NOMINMAX
+#         undef NOMINMAX
+#      endif
+#      define NOMINMAX
+#      include <windows.h>
+#   elif HAVE_PTHREAD
+#      include <pthread.h>
+#   endif
+#else
+#   include <mutex>
 #endif
 
 ILMTHREAD_INTERNAL_NAMESPACE_HEADER_ENTER
 
-class Lock;
 
+// in c++11, this can just be
+//
+// using Mutex = std::mutex;
+// unfortunately we can't use std::unique_lock as a replacement for Lock since
+// they have different API.
+//
+// if we decide to break the API, we can just
+//
+// using Lock = std::lock_guard<std::mutex>;
+// or
+// using Lock = std::unique_lock<std::mutex>;
+//
+// (or eliminate the type completely and have people use the std library) 
+#ifdef ILMBASE_FORCE_CXX03
+
+class Lock;
 
 class ILMTHREAD_EXPORT Mutex
 {
@@ -108,15 +127,16 @@ class ILMTHREAD_EXPORT Mutex
 
     friend class Lock;
 };
-
+#else
+using Mutex = std::mutex;
+#endif
 
 class ILMTHREAD_EXPORT Lock
 {
   public:
 
-    Lock (const Mutex& m, bool autoLock = true):
-	_mutex (m),
-	_locked (false)
+    Lock (Mutex& m, bool autoLock = true):
+        _mutex (m), _locked (false)
     {
         if (autoLock)
         {
@@ -150,8 +170,8 @@ class ILMTHREAD_EXPORT Lock
 
   private:
 
-    const Mutex &	_mutex;
-    bool		_locked;
+    Mutex & _mutex;
+    bool    _locked;
 };
 
 

diff --git a/IlmBase/IlmThread/IlmThreadMutexPosix.cpp b/IlmBase/IlmThread/IlmThreadMutexPosix.cpp
@@ -41,11 +41,12 @@
 
 #include "IlmBaseConfig.h"
 
-#if HAVE_PTHREAD
+#ifdef ILMBASE_FORCE_CXX03
+#   if HAVE_PTHREAD
 
-#include "IlmThreadMutex.h"
-#include "Iex.h"
-#include <assert.h>
+#      include "IlmThreadMutex.h"
+#      include "Iex.h"
+#      include <assert.h>
 
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_ENTER
 
@@ -82,4 +83,5 @@ Mutex::unlock () const
 
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_EXIT
 
+#   endif
 #endif
diff --git a/IlmBase/IlmThread/IlmThreadMutexWin32.cpp b/IlmBase/IlmThread/IlmThreadMutexWin32.cpp
@@ -38,8 +38,11 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "IlmThreadMutex.h"
-#include "Iex.h"
+#include "IlmBaseConfig.h"
+
+#ifdef ILMBASE_FORCE_CXX03
+#   include "IlmThreadMutex.h"
+#   include "Iex.h"
 
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_ENTER
 
@@ -71,3 +74,5 @@ Mutex::unlock () const
 
 
 ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_EXIT
+
+#endif