(cleanup_tss): disabled call to free_all_keys_left () with

ACE_HAS_TSS_EMULATION, because ACE_TSS_Cleanup::in_use_key_
initialization isn't thread safe, yet.

1 files changed, 7 insertions, 0 deletions

diff --git a/ace/OS.cpp b/ace/OS.cpp
index 320235fe5b5..cb112248a8f 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -2101,8 +2101,15 @@ ACE_OS::cleanup_tss (const u_int main_thread)
 #endif /* ! ACE_HAS_TSS_EMULATION  &&  ! ACE_HAS_MINIMAL_ACE_OS */
 
 #if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION)
+#if !defined (ACE_HAS_TSS_EMULATION)
+      // Don't do this with TSS_Emulation, because the
+      // ACE_TSS_Cleanup::in_use_key_ initialization isn't
+      // thread safe, yet.
+
       // Remove all TSS_Info table entries.
       ACE_TSS_Cleanup::instance ()->free_all_keys_left ();
+#endif /* ! ACE_HAS_TSS_EMULATION) */
+
       // Finally, free up the ACE_TSS_Cleanup instance.  This method gets
       // called by the ACE_Object_Manager.
       delete ACE_TSS_Cleanup::instance ();