diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/TCP.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/TCP.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 24eeb1f0930..2170d7dc6b8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "orbsvcs/AV/TCP.h" -#include "orbsvcs/AV/AVStreams_i.h" +#include "TCP.h" +#include "AVStreams_i.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //------------------------------------------------------------ // TAO_AV_TCP_Transport //------------------------------------------------------------ @@ -535,7 +533,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, inet_addr->set (inet_addr->get_port_number (), inet_addr->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); @@ -596,7 +594,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, address->set (address->get_port_number (), address->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; address->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) @@ -661,7 +659,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) if (this->peer ().get_remote_addr (addr) == -1) return -1; - char server[MAXHOSTNAMELEN + 16]; + ACE_TCHAR server[MAXHOSTNAMELEN + 16]; (void) addr.addr_to_string (server, sizeof (server)); @@ -696,8 +694,6 @@ TAO_AV_TCP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, return TAO_AV_Flow_Handler::handle_timeout (tv,arg); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_AV_TCP_Flow_Factory, ACE_TEXT ("TCP_Flow_Factory"), ACE_SVC_OBJ_T, |