1 files changed, 16 insertions, 22 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 138fee4eb92..8582dd19f01 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -1,19 +1,16 @@
 // $Id$
 
-#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h"
-#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
+#include "RequestProcessingStrategyFactoryImpl.h"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "RequestProcessingStrategyServantLocator.h"
+#include "RequestProcessingStrategyServantActivator.h"
 #include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -131,20 +128,17 @@ namespace TAO
           ACE_CHECK;
         }
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_STATIC_SVC_DEFINE (
+        RequestProcessingStrategyFactoryImpl,
+        ACE_TEXT ("RequestProcessingStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
 
-ACE_STATIC_SVC_DEFINE (
-  RequestProcessingStrategyFactoryImpl,
-  ACE_TEXT ("RequestProcessingStrategyFactory"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyFactoryImpl)
+  }
+}
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  RequestProcessingStrategyFactoryImpl,
-  TAO::Portable_Server::RequestProcessingStrategyFactoryImpl)