diff options
Diffstat (limited to 'ACE/ace/Message_Queue_T.cpp')
| -rw-r--r-- | ACE/ace/Message_Queue_T.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index 4eabd618369..1c083767fe9 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -923,8 +923,8 @@ template <ACE_SYNCH_DECL> ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue (size_t hwm, size_t lwm, ACE_Notification_Strategy *ns) - : not_empty_cond_ (this->lock_), - not_full_cond_ (this->lock_) + : not_empty_cond_ (lock_), + not_full_cond_ (lock_) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue"); @@ -1119,7 +1119,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail_i (ACE_Message_Block *new_item) if (this->signal_dequeue_waiters () == -1) return -1; else - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } // Actually put the node(s) at the head (no locking) @@ -1163,7 +1163,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head_i (ACE_Message_Block *new_item) if (this->signal_dequeue_waiters () == -1) return -1; else - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } // Actually put the node at its proper position relative to its @@ -1234,7 +1234,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item) if (this->signal_dequeue_waiters () == -1) return -1; else - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } // Actually put the node at its proper position relative to its @@ -1350,7 +1350,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item && this->signal_enqueue_waiters () == -1) return -1; else - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } // Get the earliest (i.e., FIFO) ACE_Message_Block with the lowest @@ -1426,7 +1426,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_prio_i (ACE_Message_Block *&dequeued) && this->signal_enqueue_waiters () == -1) return -1; else - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } // Actually get the last ACE_Message_Block (no locking, so must be @@ -1475,7 +1475,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail_i (ACE_Message_Block *&dequeued) && this->signal_enqueue_waiters () == -1) return -1; else - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } // Actually get the ACE_Message_Block with the lowest deadline time @@ -1571,7 +1571,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (ACE_Message_Block *&first_i return -1; first_item = this->head_; - return ACE_Utils::Truncate<int> (this->cur_count_); + return ACE_Utils::truncate_cast<int> (this->cur_count_); } template <ACE_SYNCH_DECL> int |