1 files changed, 13 insertions, 18 deletions
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 07e24aebc59..8f2fe097b6e 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/LifespanStrategyFactoryImpl.h"
-#include "tao/PortableServer/LifespanStrategy.h"
+#include "LifespanStrategyFactoryImpl.h"
+#include "LifespanStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -82,20 +80,17 @@ namespace TAO
         }
       }
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_STATIC_SVC_DEFINE (
+        LifespanStrategyFactoryImpl,
+        ACE_TEXT ("LifespanStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (LifespanStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
 
-ACE_STATIC_SVC_DEFINE (
-  LifespanStrategyFactoryImpl,
-  ACE_TEXT ("LifespanStrategyFactory"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (LifespanStrategyFactoryImpl),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyFactoryImpl)
+  }
+}
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  LifespanStrategyFactoryImpl,
-  TAO::Portable_Server::LifespanStrategyFactoryImpl)