1 files changed, 14 insertions, 20 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index bc3a3510554..8703ddb53f6 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "tao/PortableServer/ServantRetentionStrategy.h"
-#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
+#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyNonRetain.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -51,22 +49,18 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_STATIC_SVC_DEFINE (
+        ServantRetentionStrategyNonRetainFactoryImpl,
+        ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
 
-ACE_STATIC_SVC_DEFINE (
-  ServantRetentionStrategyNonRetainFactoryImpl,
-  ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)
-
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  ServantRetentionStrategyNonRetainFactoryImpl,
-  TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyNonRetainFactoryImpl)
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */