diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-01-23 16:50:16 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-01-23 16:50:16 +0100 |
commit | ed8c137ff9267c34729167b441307323aec5a7ab (patch) | |
tree | 8104bc86439cbc669feffd59279766bf89171570 | |
parent | fe8227ca130cce43657dcdcca667dd5fc0ab0da3 (diff) | |
parent | f52ebbaaaf92f2384125be0ac64f70ef02792145 (diff) | |
download | ATCD-ed8c137ff9267c34729167b441307323aec5a7ab.tar.gz |
Merge branch 'jwi-type2' into jwi-type
-rw-r--r-- | TAO/tao/Transport.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Oneway_Timeouts/client.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index a20952ed860..5ba926432e4 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -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; 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) { |