diff options
Diffstat (limited to 'TAO/tao/Strategies/SCIOP_Connector.cpp')
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Connector.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 663bccdb60a..60ec25b6100 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/SCIOP_Connector.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Connector.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -24,9 +24,6 @@ ACE_RCSID (TAO, SCIOP_Connector, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SCIOP_PROFILE), lite_flag_ (flag), @@ -162,7 +159,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()), + ACE_TEXT_TO_TCHAR_IN(sciop_endpoint->host()), sciop_endpoint->port(), r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); @@ -425,6 +422,5 @@ TAO_SCIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_SCIOP == 1 */ |