moved ACE_Static_Object_Lock from Synch.h to Object_Manager.h

1 files changed, 0 insertions, 28 deletions

diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index 3dd0e9c3405..07c3324f0d6 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -14,10 +14,6 @@
 #include "ace/Synch.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_MT_SAFE) && defined (ACE_HAS_THREADS)
-ACE_Recursive_Thread_Mutex *ACE_Static_Object_Lock::mutex_ = 0;
-#endif
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
 ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex)
@@ -902,30 +898,6 @@ ACE_RW_Thread_Mutex::dump (void) const
   ACE_RW_Mutex::dump ();
 }
 
-////////////////////////////////////////////////////////////////
-#include "ace/Malloc.h"
-
-void
-ACE_Static_Object_Lock::close_singleton (void)
-{
-  delete ACE_Static_Object_Lock::mutex_;
-  ACE_Static_Object_Lock::mutex_ = 0;
-}
-
-ACE_Recursive_Thread_Mutex *
-ACE_Static_Object_Lock::instance (void)
-{
-  // We assume things before main are single threaded.
-  if (ACE_Static_Object_Lock::mutex_ == 0)
-    {
-      ACE_NEW_RETURN (ACE_Static_Object_Lock::mutex_,
-		      ACE_Recursive_Thread_Mutex, 0);
-    }
-
-  return ACE_Static_Object_Lock::mutex_;
-}
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 // These are only specialized with ACE_HAS_THREADS.
 template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;