*** empty log message ***

1 files changed, 14 insertions, 14 deletions

diff --git a/ace/Message_Queue.i b/ace/Message_Queue.i
index 73bdb402b8f..15e07b64da0 100644
--- a/ace/Message_Queue.i
+++ b/ace/Message_Queue.i
@@ -43,7 +43,7 @@ template <ACE_SYNCH_1> ACE_INLINE int
 ACE_Message_Queue<ACE_SYNCH_2>::is_empty (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::is_empty");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->is_empty_i ();
 }
@@ -54,7 +54,7 @@ template <ACE_SYNCH_1> ACE_INLINE int
 ACE_Message_Queue<ACE_SYNCH_2>::is_full (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::is_full");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->is_full_i ();
 }
@@ -63,7 +63,7 @@ template <ACE_SYNCH_1> ACE_INLINE size_t
 ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->high_water_mark_;
 }
@@ -72,7 +72,7 @@ template <ACE_SYNCH_1> ACE_INLINE void
 ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark (size_t hwm)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark");
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_);
 
   this->high_water_mark_ = hwm;
 }
@@ -81,7 +81,7 @@ template <ACE_SYNCH_1> ACE_INLINE size_t
 ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->low_water_mark_;
 }
@@ -90,7 +90,7 @@ template <ACE_SYNCH_1> ACE_INLINE void
 ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark (size_t lwm)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark");
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_);
 
   this->low_water_mark_ = lwm;
 }
@@ -101,7 +101,7 @@ template <ACE_SYNCH_1> ACE_INLINE size_t
 ACE_Message_Queue<ACE_SYNCH_2>::message_bytes (void)
 { 
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::message_bytes");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->cur_bytes_;
 }
@@ -112,7 +112,7 @@ template <ACE_SYNCH_1> ACE_INLINE size_t
 ACE_Message_Queue<ACE_SYNCH_2>::message_count (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::message_count");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->cur_count_;
 }
@@ -121,7 +121,7 @@ template <ACE_SYNCH_1> int
 ACE_Message_Queue<ACE_SYNCH_2>::activate (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::activate");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->activate_i ();
 }
@@ -130,7 +130,7 @@ template <ACE_SYNCH_1> int
 ACE_Message_Queue<ACE_SYNCH_2>::deactivate (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::deactivate");
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->deactivate_i ();
 }
@@ -145,7 +145,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_2>::ACE_Message_Queue_Iterator (ACE_Message
 template <ACE_SYNCH_1> int 
 ACE_Message_Queue_Iterator<ACE_SYNCH_2>::next (ACE_Message_Block *&entry)
 {
-  ACE_Read_Guard<ACE_SYNCH_MUTEX> m (this->queue_.lock_);
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   if (this->curr_ != 0)
     {
@@ -159,7 +159,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_2>::next (ACE_Message_Block *&entry)
 template <ACE_SYNCH_1> int
 ACE_Message_Queue_Iterator<ACE_SYNCH_2>::advance (void)
 {
-  ACE_Read_Guard<ACE_SYNCH_MUTEX> m (this->queue_.lock_);
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   this->curr_ = this->curr_->next ();
   return this->curr_ != 0;
@@ -183,7 +183,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_2>::ACE_Message_Queue_Reverse_Itera
 template <ACE_SYNCH_1> int 
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_2>::next (ACE_Message_Block *&entry)
 {
-  ACE_Read_Guard<ACE_SYNCH_MUTEX> m (this->queue_.lock_);
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   if (this->curr_ != 0)
     {
@@ -197,7 +197,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_2>::next (ACE_Message_Block *&entry
 template <ACE_SYNCH_1> int
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_2>::advance (void)
 {
-  ACE_Read_Guard<ACE_SYNCH_MUTEX> m (this->queue_.lock_);
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   this->curr_ = this->curr_->prev ();
   return this->curr_ != 0;