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

4 files changed, 9 insertions, 9 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index dc108b20904..1fd2e3cd945 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -164,7 +164,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
 
   CC_LockModeEnum lm = lmconvert (mode);
 
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mlock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mlock_);
 
   if (lock_[lm] == 0) // This lock is not held.
     ACE_THROW (CosConcurrencyControl::LockNotHeld());
@@ -225,7 +225,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
 int
 CC_LockSet::lock_i (CC_LockModeEnum lm)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
   // If the lock is not compatible with the locks we hold allready or
   // there is lock requests in the queue we cannot grant the lock and
   // thus we queue the request. Otherwise update the lock count.
@@ -246,7 +246,7 @@ CC_LockSet::lock_i (CC_LockModeEnum lm)
 int
 CC_LockSet::try_lock_i (CC_LockModeEnum lm)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
   // If the lock we try is compatible with the locks we hold we just
   // opdates the count. Otherwise we return false.
   if (compatible (lm) == 0)
@@ -265,7 +265,7 @@ int
 CC_LockSet::change_mode_i (CC_LockModeEnum lm_held,
                           CC_LockModeEnum lm_new)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
   // If the new mode is compatible with the modes we hold we change
   // the counts for the two locks. If not we must queue the new
   // request. We can decrement the count for the old mode without
@@ -292,7 +292,7 @@ CC_LockSet::change_mode_i (CC_LockModeEnum lm_held,
 int
 CC_LockSet::lock_held (CC_LockModeEnum lm)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1);
   if (lock_[lm] > 0)
     return 1;
   else
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 309fb762f60..f647a2e13da 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -172,7 +172,7 @@ private:
   // Mapping between requested and held lock modes. Used by compatible
   // (...).  Uses the internal enumeration as indices.
 
-  ACE_SYNCH_MUTEX mlock_;
+  TAO_SYNCH_MUTEX mlock_;
   // Lock to ensure that race conditions does not occur.
 
   ACE_Unbounded_Queue <CC_LockModeEnum> lock_queue_;
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 1d857c61366..e91e8fbc399 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -34,7 +34,7 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
 {
   CC_LockSet *ls = 0;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet,
@@ -51,7 +51,7 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which,
 {
   CC_LockSet *ls = 0;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
   // @@ I commented out the following statement becuase it doesn't make any
   //    sense at all.    -- Nanbor
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 133cbe25e7b..ad2e6e6b2a5 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -55,7 +55,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   // Lock to serialize the access to the factory.
 };