diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-01-24 11:14:01 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-01-24 11:14:01 +0100 |
| commit | 163b2346ec203758a6ee9135986a3a282ecaacdd (patch) | |
| tree | 905305d668c87020e0d4a9cb881df9bdda8f2984 | |
| parent | 2b072ace999e019e903379787b8ae13efb2eca5c (diff) | |
| parent | 31614d6781c67d1ada07703c1f09dcf24e9f2202 (diff) | |
| download | ATCD-163b2346ec203758a6ee9135986a3a282ecaacdd.tar.gz | |
Merge branch 'master' into jwi-docucleanup
| -rw-r--r-- | TAO/tao/Connector_Registry.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Transport.cpp | 10 | ||||
| -rw-r--r-- | TAO/tests/Oneway_Timeouts/client.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 99c57a9add1..9df7f6418fc 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -184,7 +184,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") - ACE_TEXT ("create_profile: Unknown profile tag 0x%x\n"), + ACE_TEXT ("create_profile: Unknown profile tag <0x%x>\n"), tag)); } @@ -252,7 +252,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") - ACE_TEXT ("create_profile: Connector returned null profile for tag 0x%x\n"), tag)); + ACE_TEXT ("create_profile: Connector returned null profile for tag <0x%x>\n"), tag)); } return profile; diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 9792cd3ab69..5ba926432e4 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -1530,8 +1530,8 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, timeout_encountered = true; if (byte_count == 0) { - //This request has timed out and none of it was sent to the transport - //We can't return -1 here, since that would end up closing the tranpsort + // This request has timed out and none of it was sent to the transport + // We can't return -1 here, since that would end up closing the transport if (TAO_debug_level > 2) { TAOLIB_DEBUG ((LM_DEBUG, @@ -1645,7 +1645,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, this->id ())); } - size_t sent_byte = sent_byte_count_; + size_t const sent_byte = sent_byte_count_; int ret = 0; { typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK; @@ -1660,8 +1660,8 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, { if (sent_byte == sent_byte_count_) // if nothing was actually flushed { - //This request has timed out and none of it was sent to the transport - //We can't return -1 here, since that would end up closing the tranpsort + // This request has timed out and none of it was sent to the transport + // We can't return -1 here, since that would end up closing the transport if (TAO_debug_level > 2) { TAOLIB_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index 52f7a79c751..0dc112bb20b 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -369,7 +369,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) // can connect immediately and some may take longer time. With the flag on, // the test sets the SYNC_NONE scope and sends a request so the transport // queue is not empty for some SYNC_DELAYED_BUFFERING test case and hence - // the requests are all queued and will be received by server continueously + // the requests are all queued and will be received by server continuously // during a short period. if (make_request_queued) { |