ChangeLogTag:Mon Nov 03 18:32:42 1997 Carlos O'Ryan <coryan@MILONGA>

1 files changed, 14 insertions, 14 deletions

diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.i
index c79047a48b4..e405007406f 100644
--- a/ace/Atomic_Op.i
+++ b/ace/Atomic_Op.i
@@ -4,7 +4,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++ (void)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   return ++this->value_;
 }
 
@@ -12,7 +12,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator+= (const TYPE &i)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator+=");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   return this->value_ += i;
 }
 
@@ -20,7 +20,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-- (void)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator--");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   return --this->value_;
 }
 
@@ -28,7 +28,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-= (const TYPE &i)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-=");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   return this->value_ -= i;
 }
 
@@ -43,7 +43,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++ (int)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   return this->value_++;
 }
 
@@ -51,7 +51,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-- (int)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator--");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   return this->value_--;
 }
 
@@ -59,7 +59,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE int
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator== (const TYPE &i) const
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator==");
-  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->lock_);
+  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->mutex_);
   return this->value_ == i;
 }
 
@@ -74,7 +74,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE int
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator>= (const TYPE &i) const
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator>=");
-  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->lock_);
+  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->mutex_);
   return this->value_ >= i;
 }
 
@@ -82,7 +82,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE int
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator> (const TYPE &rhs) const
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator>");
-  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->lock_);
+  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->mutex_);
   return this->value_ > rhs;
 }
 
@@ -90,7 +90,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE int
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator<= (const TYPE &rhs) const
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator<=");
-  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->lock_);
+  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->mutex_);
   return this->value_ <= rhs;
 }
 
@@ -98,7 +98,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE int
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator< (const TYPE &rhs) const
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator<");
-  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->lock_);
+  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->mutex_);
   return this->value_ < rhs;
 }
 
@@ -108,7 +108,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &r
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator=");
   if (&rhs == this)
     return; // Avoid deadlock...
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   // This will call ACE_Atomic_Op::TYPE(), which will ensure the value
   // of <rhs> is acquired atomically.
 
@@ -119,7 +119,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::value (void) const
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::value");
-  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->lock_);
+  ACE_Guard<ACE_LOCK> m ((ACE_LOCK &) this->mutex_);
   return this->value_;    
 }
 
@@ -127,7 +127,7 @@ template <class ACE_LOCK, class TYPE> ACE_INLINE void
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const TYPE &i)
 {
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::operator=");
-  ACE_Guard<ACE_LOCK> m (this->lock_);
+  ACE_Guard<ACE_LOCK> m (this->mutex_);
   this->value_ = i;
 }