1 files changed, 11 insertions, 19 deletions
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index d1071f1470c..19b94296166 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
+#include "IdUniquenessStrategyMultiple.h"
 
 ACE_RCSID (PortableServer,
            Id_Uniqueness_Strategy,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -48,20 +45,15 @@ namespace TAO
       return ::PortableServer::MULTIPLE_ID;
     }
 
+    ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyMultiple)
+
+    ACE_STATIC_SVC_DEFINE (
+        IdUniquenessStrategyMultiple,
+        ACE_TEXT ("IdUniquenessStrategyMultiple"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdUniquenessStrategyMultiple),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  IdUniquenessStrategyMultiple,
-  TAO::Portable_Server::IdUniquenessStrategyMultiple)
-
-ACE_STATIC_SVC_DEFINE (
-  IdUniquenessStrategyMultiple,
-  ACE_TEXT ("IdUniquenessStrategyMultiple"),
-  ACE_SVC_OBJ_T,
-  &ACE_SVC_NAME (IdUniquenessStrategyMultiple),
-  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-  0)