1 files changed, 19 insertions, 12 deletions
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index fbdbaed75c4..d7775832e2c 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
-#include "IdAssignmentStrategySystem.h"
+#include "tao/PortableServer/IdAssignmentStrategySystem.h"
 
 ACE_RCSID (PortableServer,
            Id_Assignment_Strategy,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   namespace Portable_Server
@@ -21,17 +24,21 @@ namespace TAO
     {
       return true;
     }
-
-    ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategySystem)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategySystem,
-        ACE_TEXT ("IdAssignmentStrategySystem"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategySystem),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_FACTORY_NAMESPACE_DEFINE (
+  ACE_Local_Service,
+  IdAssignmentStrategySystem,
+  TAO::Portable_Server::IdAssignmentStrategySystem)
+
+ACE_STATIC_SVC_DEFINE (
+  IdAssignmentStrategySystem,
+  ACE_TEXT ("IdAssignmentStrategySystem"),
+  ACE_SVC_OBJ_T,
+  &ACE_SVC_NAME (IdAssignmentStrategySystem),
+  ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+  0)
+