diff options
| author | nw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-01 22:21:16 +0000 |
|---|---|---|
| committer | nw1 <nw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-01 22:21:16 +0000 |
| commit | e5e498aaeb06c7084c4975332713929eecaa5c48 (patch) | |
| tree | c9068311707f944ea43be02752b3fc20aae8a926 /ace/Malloc.cpp | |
| parent | b40082971a6c00ce4b8ac6d295af30955bf8db79 (diff) | |
| download | ATCD-e5e498aaeb06c7084c4975332713929eecaa5c48.tar.gz | |
Changed the lock held by ACE_Static_Object_Lock from ACE_Thread_Mutex to ACE_Recurssive_Thread_Mutex.
Diffstat (limited to 'ace/Malloc.cpp')
| -rw-r--r-- | ace/Malloc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp index 715e9b539a1..0393b743edc 100644 --- a/ace/Malloc.cpp +++ b/ace/Malloc.cpp @@ -68,7 +68,7 @@ ACE_Allocator::instance (void) if (ACE_Allocator::allocator_ == 0) { // Perform Double-Checked Locking Optimization. - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance (), 0)); if (ACE_Allocator::allocator_ == 0) @@ -86,7 +86,7 @@ ACE_Allocator * ACE_Allocator::instance (ACE_Allocator *r) { ACE_TRACE ("ACE_Allocator::instance"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance (), 0)); ACE_Allocator *t = ACE_Allocator::allocator_; @@ -102,7 +102,7 @@ ACE_Allocator::close_singleton (void) { ACE_TRACE ("ACE_Allocator::close_singleton"); - ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance ())); if (ACE_Allocator::delete_allocator_) |