1 files changed, 20 insertions, 25 deletions
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 844e29defa6..f81e882b419 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -1,37 +1,34 @@
-#include "tao/Transport_Connector.h"
-#include "tao/Transport.h"
-#include "tao/ORB_Core.h"
-#include "tao/MProfile.h"
-#include "tao/Profile.h"
-#include "tao/Environment.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/debug.h"
-#include "tao/Connect_Strategy.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Connection_Handler.h"
-#include "tao/Profile_Transport_Resolver.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/SystemException.h"
+#include "Transport_Connector.h"
+#include "Transport.h"
+#include "ORB_Core.h"
+#include "MProfile.h"
+#include "Profile.h"
+#include "Environment.h"
+#include "Thread_Lane_Resources.h"
+#include "debug.h"
+#include "Connect_Strategy.h"
+#include "Client_Strategy_Factory.h"
+#include "Connection_Handler.h"
+#include "Profile_Transport_Resolver.h"
+#include "Wait_Strategy.h"
+#include "SystemException.h"
 
 #include "ace/OS_NS_string.h"
 
 //@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Transport_Connector.inl"
+# include "Transport_Connector.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            Connector,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Connector
 TAO_Connector::TAO_Connector (CORBA::ULong tag)
   : active_connect_strategy_ (0),
-    tag_ (tag),
+    tag_(tag),
     orb_core_ (0)
 {
 }
@@ -105,7 +102,7 @@ TAO_Connector::make_mprofile (const char *string,
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ")
                   ACE_TEXT ("<%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (string)));
+                  ACE_TEXT_TO_TCHAR_IN (string)));
     }
 
   ACE_CString ior;
@@ -176,8 +173,8 @@ TAO_Connector::make_mprofile (const char *string,
   //    `shu/arf'
   //    `1.1@chicken/arf'
 
-  ssize_t begin = 0;
-  ssize_t end = ior_index - 1;
+  int begin = 0;
+  int end = ior_index - 1;
   // Initialize the end of the endpoint index
 
   for (CORBA::ULong j = 0; j < profile_count; ++j)
@@ -193,7 +190,7 @@ TAO_Connector::make_mprofile (const char *string,
           end = objkey_index;  // Handle last endpoint differently
         }
 
-      if (end < static_cast<ssize_t> (ior.length ()) && end != ior.npos)
+      if (end < static_cast<int> (ior.length ()) && end != ior.npos)
         {
           ACE_CString endpoint = ior.substring (begin, end - begin);
 
@@ -530,5 +527,3 @@ TAO_Connector::check_connection_closure (
 }
 
 //@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK
-
-TAO_END_VERSIONED_NAMESPACE_DECL