4_27_06 branch merge in and compile error fixedoci_dave_wchar_refactor_branch

1 files changed, 4 insertions, 4 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
index 92b05187fa8..9535d24eef2 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -1,6 +1,6 @@
 //================================================
 /**
- *  @file  STD_CPD_Handler.h
+ *  @file  CPD_Handler.h
  *
  *  $Id$
  *
@@ -50,11 +50,11 @@ namespace CIAO
         /// Maps the values from the XSC object
         /// <ComponentPackageDescription> to the CORBA IDL type
         /// <Deployment::ComponentPackageDescription>.
-        static void component_package_descr (const ComponentPackageDescription &desc,
+        static void handle_component_package_descr (const ComponentPackageDescription &desc,
                                              ::Deployment::ComponentPackageDescription &toconfig);
 
         static ComponentPackageDescription
-        component_package_descr (const Deployment::ComponentPackageDescription& src);
+	  component_package_descr (const Deployment::ComponentPackageDescription& src);
       private:
         static ComponentPackageDescription * resolve_cpd (const char *uri);
 
@@ -63,7 +63,7 @@ namespace CIAO
       typedef Sequence_Handler < ComponentPackageDescription,
                                  ::Deployment::ComponentPackageDescriptions,
                                  ::Deployment::ComponentPackageDescription,
-                                 CPD_Handler::component_package_descr > CPD_Functor;
+                                 CPD_Handler::handle_component_package_descr > CPD_Functor;
 
     }