This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 6 insertions, 13 deletions

diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 234c493816d..f632dcd0e42 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -4,11 +4,10 @@
 
 #include "PortableGroup_Loader.h"
 #include "PortableGroup_ORBInitializer.h"
-#include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Loader,
+ACE_RCSID (PortableGroup, 
+           PortableGroup_Loader, 
            "$Id$")
 
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
@@ -20,6 +19,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
                                 char* /*argv*/ [])
 {
   ACE_TRACE ("TAO_PortableGroup_Loader::init");
+
   // Register the ORB initializer.
   ACE_TRY_NEW_ENV
     {
@@ -56,17 +56,10 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
 int
 TAO_PortableGroup_Loader::Initializer (void)
 {
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader);
-  TAO_PortableGroup_Loader *tmp =
-    ACE_Dynamic_Service<TAO_PortableGroup_Loader>::instance (
-      "PortableGroup_Loader");
+  ACE_Service_Config::static_svcs ()->
+    insert (&ace_svc_desc_TAO_PortableGroup_Loader);
 
-  if (tmp != 0)
-    {
-      return tmp->init (0, 0);
-    }
-
-  return -1;
+  return 0;
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader,