Merge branch 'release/1.10.x'

2020-03-06 10:15:25 +01:00 · 2020-03-06 10:15:25 +01:00 · c9520c8daf
parent 11eae3f1f5 0b87673747
commit c9520c8daf
2 changed files with 2 additions and 2 deletions
--- a/dtool/src/dtoolbase/mutexPosixImpl.I
+++ b/dtool/src/dtoolbase/mutexPosixImpl.I
@ -15,7 +15,7 @@
 *
 */
 constexpr MutexPosixImpl::
-MutexPosixImpl() noexcept : _lock(PTHREAD_MUTEX_INITIALIZER) {
+MutexPosixImpl() noexcept {
 }

 /**
--- a/dtool/src/dtoolbase/mutexPosixImpl.h
+++ b/dtool/src/dtoolbase/mutexPosixImpl.h
@ -40,7 +40,7 @@ public:
  INLINE void unlock();

 private:
-  pthread_mutex_t _lock;
+  pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
  friend class ConditionVarPosixImpl;
 };