diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-07-20 16:47:57 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-07-20 16:47:57 +0000 |
| commit | be4716b004a100ec5742a373089d19f78e74a0c1 (patch) | |
| tree | 3375e40f66f85583644046f603eeafbdd75ed703 /ace/Object_Manager.cpp | |
| parent | d3264b41a6dbb8e41a99cbcbdc31b97293471a97 (diff) | |
| download | ATCD-be4716b004a100ec5742a373089d19f78e74a0c1.tar.gz | |
ooops, wrapper ACE_TSS_BASE_LOCK with ifdef ACE_HAS_TSS_EMULATION &&
ACE_USE_NATIVE_KEYS
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index db129c2593e..43b0f9ca2ba 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -197,7 +197,9 @@ 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) +# if defined (ACE_HAS_TSS_EMULATION) && defined(ACE_USE_NATIVE_KEYS) + ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex, ACE_TSS_BASE_LOCK) +# endif /* ACE_HAS_TSS_EMULATION && ACE_USE_NATIVE_KEYS */ # endif /* ACE_MT_SAFE */ // Do this after the allocation of ACE_STATIC_OBJECT_LOCK. It shouldn't @@ -713,8 +715,10 @@ 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) +# if defined (ACE_HAS_TSS_EMULATION) && defined(ACE_USE_NATIVE_KEYS) + ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex, + ACE_TSS_BASE_LOCK) +# endif /* ACE_HAS_TSS_EMULATION && ACE_USE_NATIVE_KEYS */ # endif /* ACE_MT_SAFE */ #endif /* ! ACE_HAS_STATIC_PREALLOCATION */ |