1 files changed, 12 insertions, 22 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index adac1b323a4..62b1e5828ea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "FTRT_ClientORB_Loader.h"
 
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
+#include "FTRT_ClientORB_Initializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -14,8 +14,6 @@ ACE_RCSID (ClientORB,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRT {
   FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void)
   {
@@ -47,7 +45,7 @@ namespace TAO_FTRT {
       {
         curarg++;
         if (curarg < argc)
-          transaction_depth = atoi(argv[curarg]);
+          transaction_depth = ACE_OS::atoi(argv[curarg]);
       }
 
 
@@ -84,24 +82,16 @@ namespace TAO_FTRT {
 
       return 0;
   }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  TAO_FTRT,
-  FTRT_ClientORB_Loader,
-  TAO_FTRT::FTRT_ClientORB_Loader)
-
-ACE_STATIC_SVC_DEFINE (
-  FTRT_ClientORB_Loader,
-  ACE_TEXT ("FTRT_ClientORB_Service"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (FTRT_ClientORB_Loader),
-  ACE_Service_Type::DELETE_THIS
-  | ACE_Service_Type::DELETE_OBJ,
-  0)
-
+  ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader)
+  ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader,
+    ACE_TEXT ("FTRT_ClientORB_Service"),
+    ACE_SVC_OBJ_T,
+    &ACE_SVC_NAME (FTRT_ClientORB_Loader),
+    ACE_Service_Type::DELETE_THIS
+    | ACE_Service_Type::DELETE_OBJ,
+    0)
+}