*** empty log message ***

1 files changed, 42 insertions, 42 deletions

diff --git a/ace/Message_Queue.i b/ace/Message_Queue.i
index 02ded2c141a..7c0038f40d7 100644
--- a/ace/Message_Queue.i
+++ b/ace/Message_Queue.i
@@ -3,46 +3,46 @@
 
 // Message_Queue.i
 
-template <ACE_SYNCH_1> ACE_INLINE ACE_Notification_Strategy *
-ACE_Message_Queue<ACE_SYNCH_2>::notification_strategy (void)
+template <ACE_SYNCH_DECL> ACE_INLINE ACE_Notification_Strategy *
+ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::notification_strategy");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy");
 
   return this->notification_strategy_;
 }
 
-template <ACE_SYNCH_1> ACE_INLINE void
-ACE_Message_Queue<ACE_SYNCH_2>::notification_strategy (ACE_Notification_Strategy *s)
+template <ACE_SYNCH_DECL> ACE_INLINE void
+ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy (ACE_Notification_Strategy *s)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::notification_strategy");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy");
 
   this->notification_strategy_ = s;
 }
 
 // Check if queue is empty (does not hold locks). 
 
-template <ACE_SYNCH_1> ACE_INLINE int
-ACE_Message_Queue<ACE_SYNCH_2>::is_empty_i (void)
+template <ACE_SYNCH_DECL> ACE_INLINE int
+ACE_Message_Queue<ACE_SYNCH_USE>::is_empty_i (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::is_empty_i");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::is_empty_i");
   return this->cur_bytes_ <= 0 && this->cur_count_ <= 0;
 }
 
 // Check if queue is full (does not hold locks). 
 
-template <ACE_SYNCH_1> ACE_INLINE int 
-ACE_Message_Queue<ACE_SYNCH_2>::is_full_i (void)
+template <ACE_SYNCH_DECL> ACE_INLINE int 
+ACE_Message_Queue<ACE_SYNCH_USE>::is_full_i (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::is_full_i");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::is_full_i");
   return this->cur_bytes_ > this->high_water_mark_;
 }
 
 // Check if queue is empty (holds locks).
 
-template <ACE_SYNCH_1> ACE_INLINE int 
-ACE_Message_Queue<ACE_SYNCH_2>::is_empty (void)
+template <ACE_SYNCH_DECL> ACE_INLINE int 
+ACE_Message_Queue<ACE_SYNCH_USE>::is_empty (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::is_empty");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::is_empty");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->is_empty_i ();
@@ -50,46 +50,46 @@ ACE_Message_Queue<ACE_SYNCH_2>::is_empty (void)
 
 // Check if queue is full (holds locks).
 
-template <ACE_SYNCH_1> ACE_INLINE int 
-ACE_Message_Queue<ACE_SYNCH_2>::is_full (void)
+template <ACE_SYNCH_DECL> ACE_INLINE int 
+ACE_Message_Queue<ACE_SYNCH_USE>::is_full (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::is_full");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::is_full");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->is_full_i ();
 }
 
-template <ACE_SYNCH_1> ACE_INLINE size_t
-ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark (void)
+template <ACE_SYNCH_DECL> ACE_INLINE size_t
+ACE_Message_Queue<ACE_SYNCH_USE>::high_water_mark (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::high_water_mark");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->high_water_mark_;
 }
 
-template <ACE_SYNCH_1> ACE_INLINE void 
-ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark (size_t hwm)
+template <ACE_SYNCH_DECL> ACE_INLINE void 
+ACE_Message_Queue<ACE_SYNCH_USE>::high_water_mark (size_t hwm)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::high_water_mark");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::high_water_mark");
   ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_);
 
   this->high_water_mark_ = hwm;
 }
 
-template <ACE_SYNCH_1> ACE_INLINE size_t
-ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark (void)
+template <ACE_SYNCH_DECL> ACE_INLINE size_t
+ACE_Message_Queue<ACE_SYNCH_USE>::low_water_mark (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::low_water_mark");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->low_water_mark_;
 }
 
-template <ACE_SYNCH_1> ACE_INLINE void 
-ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark (size_t lwm)
+template <ACE_SYNCH_DECL> ACE_INLINE void 
+ACE_Message_Queue<ACE_SYNCH_USE>::low_water_mark (size_t lwm)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::low_water_mark");
   ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_);
 
   this->low_water_mark_ = lwm;
@@ -97,10 +97,10 @@ ACE_Message_Queue<ACE_SYNCH_2>::low_water_mark (size_t lwm)
 
 // Return the current number of bytes in the queue.
 
-template <ACE_SYNCH_1> ACE_INLINE size_t
-ACE_Message_Queue<ACE_SYNCH_2>::message_bytes (void)
+template <ACE_SYNCH_DECL> ACE_INLINE size_t
+ACE_Message_Queue<ACE_SYNCH_USE>::message_bytes (void)
 { 
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::message_bytes");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_bytes");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->cur_bytes_;
@@ -108,28 +108,28 @@ ACE_Message_Queue<ACE_SYNCH_2>::message_bytes (void)
 
 // Return the current number of messages in the queue.
 
-template <ACE_SYNCH_1> ACE_INLINE size_t
-ACE_Message_Queue<ACE_SYNCH_2>::message_count (void)
+template <ACE_SYNCH_DECL> ACE_INLINE size_t
+ACE_Message_Queue<ACE_SYNCH_USE>::message_count (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::message_count");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_count");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0);
 
   return this->cur_count_;
 }
 
-template <ACE_SYNCH_1> ACE_INLINE int
-ACE_Message_Queue<ACE_SYNCH_2>::activate (void)
+template <ACE_SYNCH_DECL> ACE_INLINE int
+ACE_Message_Queue<ACE_SYNCH_USE>::activate (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::activate");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::activate");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->activate_i ();
 }
 
-template <ACE_SYNCH_1> ACE_INLINE int
-ACE_Message_Queue<ACE_SYNCH_2>::deactivate (void)
+template <ACE_SYNCH_DECL> ACE_INLINE int
+ACE_Message_Queue<ACE_SYNCH_USE>::deactivate (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_2>::deactivate");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::deactivate");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
 
   return this->deactivate_i ();