*** empty log message ***

6 files changed, 18 insertions, 18 deletions

diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index f641a8cb04b..74d6fb4b8ee 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -69,7 +69,7 @@ ACE_Allocator::instance (void)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::get_lock (), 0));
+				*ACE_Static_Object_Lock::instance (), 0));
 
       if (ACE_Allocator::allocator_ == 0)
 	{
@@ -87,7 +87,7 @@ ACE_Allocator::instance (ACE_Allocator *r)
 {
   ACE_TRACE ("ACE_Allocator::instance");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::get_lock (), 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
   ACE_Allocator *t = ACE_Allocator::allocator_;
 
   // We can't safely delete it since we don't know who created it!
@@ -103,7 +103,7 @@ ACE_Allocator::close_singleton (void)
   ACE_TRACE ("ACE_Allocator::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::get_lock ()));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Allocator::delete_allocator_)
     {
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index b67ef9032ae..864a44713ec 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -240,7 +240,7 @@ ACE_Proactor::instance (size_t threads)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::get_lock (), 0));
+				*ACE_Static_Object_Lock::instance (), 0));
 
       if (ACE_Proactor::proactor_ == 0)
 	{
@@ -257,7 +257,7 @@ ACE_Proactor::instance (ACE_Proactor *r)
   ACE_TRACE ("ACE_Proactor::instance");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::get_lock ()_, 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
 
   ACE_Proactor *t = ACE_Proactor::proactor_;
   // We can't safely delete it since we don't know who created it!
@@ -273,7 +273,7 @@ ACE_Proactor::close_singleton (void)
   ACE_TRACE ("ACE_Proactor::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::get_lock ()_));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Proactor::delete_proactor_)
     {
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 4ee23021118..6d864504a3f 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -910,7 +910,7 @@ ACE_Reactor::instance (size_t size /* = ACE_Reactor::DEFAULT_SIZE */)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::get_lock (), 0));
+				*ACE_Static_Object_Lock::instance (), 0));
       
       if (ACE_Reactor::reactor_ == 0)
 	{
@@ -927,7 +927,7 @@ ACE_Reactor::instance (ACE_Reactor *r)
   ACE_TRACE ("ACE_Reactor::instance");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::get_lock (), 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
   ACE_Reactor *t = ACE_Reactor::reactor_;
   // We can't safely delete it since we don't know who created it!
   ACE_Reactor::delete_reactor_ = 0;
@@ -942,7 +942,7 @@ ACE_Reactor::close_singleton (void)
   ACE_TRACE ("ACE_Reactor::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::get_lock ()));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Reactor::delete_reactor_)
     {
diff --git a/ace/ReactorEx.cpp b/ace/ReactorEx.cpp
index 04b5fa1204d..9b7f2a3a11f 100644
--- a/ace/ReactorEx.cpp
+++ b/ace/ReactorEx.cpp
@@ -601,7 +601,7 @@ ACE_ReactorEx::instance (void)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::get_lock (), 0));
+				*ACE_Static_Object_Lock::instance (), 0));
 
       if (ACE_ReactorEx::reactorEx_ == 0)
 	{
@@ -619,7 +619,7 @@ ACE_ReactorEx::instance (ACE_ReactorEx *r)
   ACE_TRACE ("ACE_ReactorEx::instance");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::get_lock (), 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
   ACE_ReactorEx *t = ACE_ReactorEx::reactorEx_;
   // We can't safely delete it since we don't know who created it!
   ACE_ReactorEx::delete_reactorEx_ = 0;
@@ -634,7 +634,7 @@ ACE_ReactorEx::close_singleton (void)
   ACE_TRACE ("ACE_ReactorEx::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::get_lock ()));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_ReactorEx::delete_reactorEx_)
     {
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index e781d11fdb1..764acc1a131 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -40,7 +40,7 @@ ACE_Service_Repository::instance (int size /* = ACE_Service_Repository::DEFAULT_
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::get_lock (), 0));
+				*ACE_Static_Object_Lock::instance (), 0));
 
       if (ACE_Service_Repository::svc_rep_ == 0)
 	{
@@ -56,7 +56,7 @@ ACE_Service_Repository::instance (ACE_Service_Repository *s)
 {
   ACE_TRACE ("ACE_Service_Repository::instance");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::get_lock (), 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
 
   ACE_Service_Repository *t = ACE_Service_Repository::svc_rep_;
   // We can't safely delete it since we don't know who created it!
@@ -72,7 +72,7 @@ ACE_Service_Repository::close_singleton (void)
   ACE_TRACE ("ACE_Service_Repository::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::get_lock ()));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Service_Repository::delete_svc_rep_)
     {
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index f63780c9ad7..ca7307fd8cd 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -170,7 +170,7 @@ ACE_Thread_Manager::instance (void)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::get_lock (), 0));
+				*ACE_Static_Object_Lock::instance (), 0));
 
       if (ACE_Thread_Manager::thr_mgr_ == 0)
 	{
@@ -188,7 +188,7 @@ ACE_Thread_Manager::instance (ACE_Thread_Manager *tm)
   ACE_TRACE ("ACE_Thread_Manager::instance");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::get_lock (), 0));
+			    *ACE_Static_Object_Lock::instance (), 0));
 
   ACE_Thread_Manager *t = ACE_Thread_Manager::thr_mgr_;
   // We can't safely delete it since we don't know who created it!
@@ -204,7 +204,7 @@ ACE_Thread_Manager::close_singleton (void)
   ACE_TRACE ("ACE_Thread_Manager::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::get_lock ()));
+		     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Thread_Manager::delete_thr_mgr_)
     {