diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-05-06 12:40:06 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-05-06 12:40:06 +0000 |
| commit | 61c594418ea2b4ac36f23f4a60cb55462dc3fba3 (patch) | |
| tree | 72cf2a3b658279a118a3ccda7150b16a10230429 | |
| parent | 74ecaa960b751aa81676279c3956daf7cebfbb59 (diff) | |
| download | ATCD-61c594418ea2b4ac36f23f4a60cb55462dc3fba3.tar.gz | |
ChangeLogTag:Mon May 6 07:39:22 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/Message_Queue_T.cpp | 12 |
4 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3907141971f..d0b558a833f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon May 6 07:39:22 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Message_Queue_T.cpp (notify): Moved int queue_count definition + to outside the scope. Thanks to Chad Elliot for reporting this. + Sun May 5 19:14:34 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/Message_Queue_T.cpp: Modified all the enqueue*() methods so that diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 3907141971f..d0b558a833f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Mon May 6 07:39:22 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Message_Queue_T.cpp (notify): Moved int queue_count definition + to outside the scope. Thanks to Chad Elliot for reporting this. + Sun May 5 19:14:34 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/Message_Queue_T.cpp: Modified all the enqueue*() methods so that diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 3907141971f..d0b558a833f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Mon May 6 07:39:22 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Message_Queue_T.cpp (notify): Moved int queue_count definition + to outside the scope. Thanks to Chad Elliot for reporting this. + Sun May 5 19:14:34 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/Message_Queue_T.cpp: Modified all the enqueue*() methods so that diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index 06747d639d5..b1a565509c1 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -1199,6 +1199,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head (ACE_Message_Block *new_item, ACE_Time_Value *timeout) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head"); + int queue_count = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1211,7 +1212,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head (ACE_Message_Block *new_item, if (this->wait_not_full_cond (ace_mon, timeout) == -1) return -1; - int queue_count = this->enqueue_head_i (new_item); + queue_count = this->enqueue_head_i (new_item); if (queue_count == -1) return -1; @@ -1230,6 +1231,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_prio (ACE_Message_Block *new_item, ACE_Time_Value *timeout) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_prio"); + int queue_count = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1242,7 +1244,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_prio (ACE_Message_Block *new_item, if (this->wait_not_full_cond (ace_mon, timeout) == -1) return -1; - int queue_count = this->enqueue_i (new_item); + queue_count = this->enqueue_i (new_item); if (queue_count == -1) return -1; @@ -1260,6 +1262,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline (ACE_Message_Block *new_item, ACE_Time_Value *timeout) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline"); + int queue_count = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1272,7 +1275,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline (ACE_Message_Block *new_item, if (this->wait_not_full_cond (ace_mon, timeout) == -1) return -1; - int queue_count = this->enqueue_deadline_i (new_item); + queue_count = this->enqueue_deadline_i (new_item); if (queue_count == -1) return -1; @@ -1297,6 +1300,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail (ACE_Message_Block *new_item, ACE_Time_Value *timeout) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail"); + int queue_count = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1309,7 +1313,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail (ACE_Message_Block *new_item, if (this->wait_not_full_cond (ace_mon, timeout) == -1) return -1; - int queue_count = this->enqueue_tail_i (new_item); + queue_count = this->enqueue_tail_i (new_item); if (queue_count == -1) return -1; |