diff options
Diffstat (limited to 'TAO/tao/Transport.cpp')
-rw-r--r-- | TAO/tao/Transport.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 25e196e2a0a..ea6e73f1382 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -225,7 +225,7 @@ TAO_Transport::~TAO_Transport (void) // The following assert is needed for the test "Bug_2494_Regression". // See the bugzilla bug #2494 for details. - ACE_ASSERT (this->queue_is_empty_i ()); + ACE_ASSERT (this->head_ == 0); ACE_ASSERT (this->cache_map_entry_ == 0); #if TAO_HAS_TRANSPORT_CURRENT == 1 @@ -1020,7 +1020,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[], ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") ACE_TEXT ("byte_count = %d, head_is_empty = %d\n"), - this->id(), byte_count, this->queue_is_empty_i ())); + this->id(), byte_count, (this->head_ == 0))); } return 1; @@ -1121,7 +1121,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc) } } - if (this->queue_is_empty_i ()) + if (this->head_ == 0) { if (this->flush_timer_pending ()) { @@ -1152,7 +1152,7 @@ TAO_Transport::cleanup_queue_i () int msg_count = 0; // Cleanup all messages - while (!this->queue_is_empty_i ()) + while (this->head_ != 0) { TAO_Queued_Message *i = this->head_; @@ -1183,7 +1183,7 @@ TAO_Transport::cleanup_queue_i () void TAO_Transport::cleanup_queue (size_t byte_count) { - while (!this->queue_is_empty_i () && byte_count > 0) + while (this->head_ != 0 && byte_count > 0) { TAO_Queued_Message *i = this->head_; @@ -1363,7 +1363,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, // to send first: bool try_sending_first = true; - bool const queue_empty = this->queue_is_empty_i (); + bool const queue_empty = (this->head_ == 0); TAO::Transport_Queueing_Strategy *queue_strategy = stub->transport_queueing_strategy (); |