diff options
| -rw-r--r-- | ace/Object_Manager.cpp | 3 | ||||
| -rw-r--r-- | ace/Object_Manager.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 19e7abb8e1c..db129c2593e 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -197,6 +197,7 @@ ACE_Object_Manager::ACE_Object_Manager (void) ACE_PREALLOCATE_OBJECT (ACE_TOKEN_CONST::MUTEX, ACE_TOKEN_INVARIANTS_CREATION_LOCK) ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex, ACE_TSS_CLEANUP_LOCK) + ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex, ACE_TSS_BASE_LOCK) # endif /* ACE_MT_SAFE */ // Do this after the allocation of ACE_STATIC_OBJECT_LOCK. It shouldn't @@ -712,6 +713,8 @@ ACE_Object_Manager::~ACE_Object_Manager (void) ACE_TOKEN_INVARIANTS_CREATION_LOCK) ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex, ACE_TSS_CLEANUP_LOCK) + ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex, + ACE_TSS_BASE_LOCK) # endif /* ACE_MT_SAFE */ #endif /* ! ACE_HAS_STATIC_PREALLOCATION */ diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 25266e41002..61c92fb1a14 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -198,6 +198,9 @@ public: ACE_TOKEN_MANAGER_CREATION_LOCK, ACE_TOKEN_INVARIANTS_CREATION_LOCK, ACE_TSS_CLEANUP_LOCK, +# if defined (ACE_HAS_TSS_EMULATION) && defined(ACE_USE_NATIVE_KEYS) + ACE_TSS_BASE_LOCK, +# endif /* ACE_HAS_TSS_EMULATION && ACE_USE_NATIVE_KEYS */ #endif /* ACE_MT_SAFE */ // Hook for preallocated objects provided by application. |