1 files changed, 5 insertions, 46 deletions
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 3ec20415303..2e590457d84 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -970,11 +970,11 @@ case 30:
       if (sym != 0)
         {
           ACE_Service_Type_Impl *stp
-            = ace_create_service_type (ace_yyvsp[-3].ident_,
-                                       ace_yyvsp[-2].type_,
-                                       sym,
-                                       flags,
-                                       gobbler);
+            = ACE_Service_Config::create_service_type_impl (ace_yyvsp[-3].ident_,
+                                                            ace_yyvsp[-2].type_,
+                                                            sym,
+                                                            flags,
+                                                            gobbler);
           ace_yyval.svc_record_ = new ACE_Service_Type (ace_yyvsp[-3].ident_,
                                      stp,
                                      ace_yyvsp[-1].location_node_->handle (),
@@ -1343,47 +1343,6 @@ ace_get_module (ACE_Static_Node *str_rec,
   return mt;
 }
 
-ACE_Service_Type_Impl *
-ace_create_service_type (const ACE_TCHAR *name,
-                         int type,
-                         void *symbol,
-                         u_int flags,
-                         ACE_Service_Object_Exterminator gobbler)
-{
-  ACE_Service_Type_Impl *stp = 0;
-
-  // Note, the only place we need to put a case statement.  This is
-  // also the place where we'd put the RTTI tests, if the compiler
-  // actually supported them!
-
-  switch (type)
-    {
-    case ACE_SVC_OBJ_T:
-      ACE_NEW_RETURN (stp,
-                      ACE_Service_Object_Type ((ACE_Service_Object *) symbol,
-                                               name, flags,
-                                               gobbler),
-                      0);
-      break;
-    case ACE_MODULE_T:
-      ACE_NEW_RETURN (stp,
-                      ACE_Module_Type (symbol, name, flags),
-                      0);
-      break;
-    case ACE_STREAM_T:
-      ACE_NEW_RETURN (stp,
-                      ACE_Stream_Type (symbol, name, flags),
-                      0);
-      break;
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("unknown case\n")));
-      ace_yyerrno++;
-      break;
-    }
-  return stp;
-}
-
 #if defined (DEBUGGING)
 // Current line number.
 int ace_yylineno = 1;