ChangeLogTag: Thu Feb 1 20:29:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

6 files changed, 16 insertions, 16 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
index 37acf0d0490..696af20d676 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
@@ -17,7 +17,7 @@ TAO_LB_Minimum_Dispersion_Strategy::TAO_LB_Minimum_Dispersion_Strategy (void)
 
 TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void)
 {
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
                      this->lock_));
 
@@ -41,7 +41,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
 {
   for ( ; ; )
     {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         guard,
                         this->lock_,
                         CORBA::Object::_nil ());
@@ -73,9 +73,9 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
         proxy->replica ();
 
       {
-        ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock (this->lock_);
+        ACE_Reverse_Lock<TAO_SYNCH_MUTEX> reverse_lock (this->lock_);
 
-        ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>,
+        ACE_GUARD_RETURN (ACE_Reverse_Lock<TAO_SYNCH_MUTEX>,
                           reverse_guard,
                           reverse_lock,
                           CORBA::Object::_nil ());
@@ -109,7 +109,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
 int
 TAO_LB_Minimum_Dispersion_Strategy::insert (TAO_LB_ReplicaProxy *proxy)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
                             this->lock_,
                             -1));
@@ -120,7 +120,7 @@ TAO_LB_Minimum_Dispersion_Strategy::insert (TAO_LB_ReplicaProxy *proxy)
 int
 TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
                             this->lock_,
                             -1));
@@ -135,7 +135,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
   int send_load_advisory = 0;
 
   {
-    ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
+    ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                        guard,
                        this->lock_));
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
index bd78e0acc1f..fcf0b686ae3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
@@ -67,7 +67,7 @@ private:
   TAO_LB_ReplicaProxySet proxies_;
   // Set containing the ReplicaProxy servants.
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   // Lock used to ensure atomic access to state retained by this
   // class.
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
index 9e7bbff3759..8dc15cbde74 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
@@ -43,7 +43,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
                      this->lock_));
 
@@ -69,7 +69,7 @@ TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
 {
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
                      this->lock_));
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
index 68e8245a2b1..a4f60a41a06 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
@@ -102,7 +102,7 @@ private:
 
 private:
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   // Mutex used to ensure access ReplicaProxy state is atomic.
 
   CORBA::Object_var replica_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
index b537a3d572c..9c0c198c5d0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
@@ -18,7 +18,7 @@ TAO_LB_Round_Robin_Strategy::TAO_LB_Round_Robin_Strategy (void)
 
 TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void)
 {
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
                      guard,
                      this->lock_));
 
@@ -42,7 +42,7 @@ CORBA::Object_ptr
 TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
                     this->lock_,
                     CORBA::Object::_nil ());
@@ -86,7 +86,7 @@ TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
 int
 TAO_LB_Round_Robin_Strategy::insert (TAO_LB_ReplicaProxy *proxy)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
                             this->lock_,
                             -1));
@@ -99,7 +99,7 @@ TAO_LB_Round_Robin_Strategy::insert (TAO_LB_ReplicaProxy *proxy)
 int
 TAO_LB_Round_Robin_Strategy::remove (TAO_LB_ReplicaProxy *proxy)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                             guard,
                             this->lock_,
                             -1));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
index 8abedbc2edb..523ff488d9e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
@@ -71,7 +71,7 @@ private:
 
   ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> next_replica_;
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   // Lock used to ensure access to state within this class is atomic.
 };