1 files changed, 12 insertions, 19 deletions
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 09ca4fb613e..55f3a61fcef 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,13 +1,11 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
+#include "ImplicitActivationStrategyExplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyExplicit,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -17,22 +15,17 @@ namespace TAO
     {
       return false;
     }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
 
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyExplicit)
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  ImplicitActivationStrategyExplicit,
-  TAO::Portable_Server::ImplicitActivationStrategyExplicit)
-
-ACE_STATIC_SVC_DEFINE (
-  ImplicitActivationStrategyExplicit,
-  ACE_TEXT ("ImplicitActivationStrategyExplicit"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (ImplicitActivationStrategyExplicit),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)
+    ACE_STATIC_SVC_DEFINE (
+        ImplicitActivationStrategyExplicit,
+        ACE_TEXT ("ImplicitActivationStrategyExplicit"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ImplicitActivationStrategyExplicit),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+  }
+}