4_27_06 branch merge in and compile error fixedoci_dave_wchar_refactor_branch

1 files changed, 37 insertions, 39 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
index 31737241b51..57c97bc5b60 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
-*  @file  CPD_Handler.h
-*
-*  $Id$
-*
-*  @author Jules White <jules@dre.vanderbilt.edu>
-*/
+ *  @file  CPD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CPD_HANDLER_H
@@ -22,48 +22,46 @@
 
 namespace Deployment
 {
-class ComponentPortDescription;
-class ComponentPortDescriptions;
+  struct ComponentPortDescription;
+  class ComponentPortDescriptions;
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class ComponentPortDescription;
-/*
-* @class CPD_Handler
-*
-* @brief Handler class for <CCMComponentPortDescription> types.
-*
-* This class defines handler methods to map values from
-* XSC objects, parsed from the descriptor files, to the
-* corresponding CORBA IDL type for the schema element.
-*
-*/
+  namespace Config_Handlers
+    {
+      class ComponentPortDescription;
+      /*
+       * @class CPD_Handler
+       *
+       * @brief Handler class for <CCMComponentPortDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL type for the schema element.
+       *
+       */
 
-class Config_Handlers_Export CPD_Handler
-{
+      class Config_Handlers_Export CPD_Handler
+	{
 
-public:
-/// Maps the values from the XSC object
-/// <ComponentInterfaceDescription> to the CORBA IDL type
-/// <Deployment::ComponentInterfaceDescription>.
-static void component_port_description (
-const ComponentPortDescription &desc,
-::Deployment::ComponentPortDescription &toconfig);
+	public:
+	  /// Maps the values from the XSC object
+	  /// <ComponentInterfaceDescription> to the CORBA IDL type
+	  /// <Deployment::ComponentInterfaceDescription>.
+	  static void handle_component_port_description (const ComponentPortDescription &desc,
+							 ::Deployment::ComponentPortDescription &toconfig);
 
-static ComponentPortDescription
-component_port_description (
-const Deployment::ComponentPortDescription& src);
-};
+	  static ComponentPortDescription
+	    component_port_description (const Deployment::ComponentPortDescription& src);
+	};
 
-typedef Sequence_Handler < ComponentPortDescription,
-::Deployment::ComponentPortDescriptions,
-::Deployment::ComponentPortDescription,
-CPD_Handler::component_port_description > CPD_Functor;
+      typedef Sequence_Handler < ComponentPortDescription,
+				 ::Deployment::ComponentPortDescriptions,
+				 ::Deployment::ComponentPortDescription,
+				 CPD_Handler::handle_component_port_description > CPD_Functor;
 
-}
+    }
 }
 
 #include /**/ "ace/post.h"