Merge branch 'release/1.10.x'

rdb · rdb · commit c9520c8daff5 · 2020-03-06T10:15:25.000+01:00
diff --git 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 {
 }
 
 /**
diff --git a/dtool/src/dtoolbase/mutexPosixImpl.h b/dtool/src/dtoolbase/mutexPosixImpl.h
@@ -40,7 +40,7 @@ class EXPCL_DTOOL_DTOOLBASE MutexPosixImpl {
   INLINE void unlock();
 
 private:
-  pthread_mutex_t _lock;
+  pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
   friend class ConditionVarPosixImpl;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`	`constexpr MutexPosixImpl::`
`18`		`-MutexPosixImpl() noexcept : _lock(PTHREAD_MUTEX_INITIALIZER) {`
	`18`	`+MutexPosixImpl() noexcept {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/**`