1 files changed, 12 insertions, 18 deletions
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 2a903d2876b..0212e5a092e 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategySingle.h"
+#include "ThreadStrategySingle.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -10,8 +10,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -33,22 +31,18 @@ namespace TAO
     {
       return ::PortableServer::SINGLE_THREAD_MODEL;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingle)
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  ThreadStrategySingle,
-  TAO::Portable_Server::ThreadStrategySingle)
-
-ACE_STATIC_SVC_DEFINE (
-  ThreadStrategySingle,
-  ACE_TEXT ("ThreadStrategySingle"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (ThreadStrategySingle),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)
+    ACE_STATIC_SVC_DEFINE (
+        ThreadStrategySingle,
+        ACE_TEXT ("ThreadStrategySingle"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ThreadStrategySingle),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */