mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
TypeRegistry requires a reentrant mutex
This commit is contained in:
parent
ac89fe25bd
commit
9ada65e1d4
@ -39,7 +39,7 @@ freshen_derivations() {
|
||||
////////////////////////////////////////////////////////////////////
|
||||
INLINE void TypeRegistry::
|
||||
init_lock() {
|
||||
if (_lock == (MutexImpl *)NULL) {
|
||||
_lock = new MutexImpl;
|
||||
if (_lock == (ReMutexImpl *)NULL) {
|
||||
_lock = new ReMutexImpl;
|
||||
}
|
||||
}
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
MutexImpl *TypeRegistry::_lock = NULL;
|
||||
ReMutexImpl *TypeRegistry::_lock = NULL;
|
||||
TypeRegistry *TypeRegistry::_global_pointer = NULL;
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
|
@ -111,7 +111,7 @@ private:
|
||||
|
||||
bool _derivations_fresh;
|
||||
|
||||
static MutexImpl *_lock;
|
||||
static ReMutexImpl *_lock;
|
||||
static TypeRegistry *_global_pointer;
|
||||
|
||||
friend class TypeHandle;
|
||||
|
Loading…
x
Reference in New Issue
Block a user