1 files changed, 12 insertions, 18 deletions
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index 44edaa4b6a9..abec20789c5 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategyORBControl.h"
+#include "ThreadStrategyORBControl.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            ThreadStrategyORBControl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -30,21 +28,17 @@ namespace TAO
     {
       return ::PortableServer::ORB_CTRL_MODEL;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyORBControl)
 
+    ACE_STATIC_SVC_DEFINE (
+        ThreadStrategyORBControl,
+        ACE_TEXT ("ThreadStrategyORBControl"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ThreadStrategyORBControl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+  }
+}
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  ThreadStrategyORBControl,
-  TAO::Portable_Server::ThreadStrategyORBControl)
-
-ACE_STATIC_SVC_DEFINE (
-  ThreadStrategyORBControl,
-  ACE_TEXT ("ThreadStrategyORBControl"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (ThreadStrategyORBControl),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)