diff options
author | bala <balanatarajan@users.noreply.github.com> | 2004-09-09 19:02:06 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2004-09-09 19:02:06 +0000 |
commit | 9f563f3b58a08f816837b632da01d7c5f519fe29 (patch) | |
tree | f3baa07080c4204f7f15a3b2816231fdea18a5bc | |
parent | 2a6d64be8c68820b74c942413a1f99c0fb285f63 (diff) | |
download | ATCD-9f563f3b58a08f816837b632da01d7c5f519fe29.tar.gz |
*** empty log message ***
5 files changed, 59 insertions, 52 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h index 08a72795ae5..f061b5361e5 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/ANY_Handler.h @@ -12,17 +12,20 @@ #define CIAO_CONFIG_HANDLERS_ANY_HANDLER_H #include /**/ "ace/pre.h" -#include "Basic_Deployment_Data.hpp" +#include "ace/config-lite.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "Basic_Deployment_Data.hpp" + namespace CORBA { class Any; } +// @@ Jules, can you please change the name of this file? namespace CIAO { @@ -38,15 +41,15 @@ namespace CIAO * corresponding CORBA IDL Any type. * */ - + class ANY_Handler{ - + public: - + ANY_Handler (void); virtual ~ANY_Handler (void); - - static void get_Any (CORBA::Any& toconfig, Any& desc); + + static void get_Any (CORBA::Any& toconfig, Any& desc); }; } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp index 8590c1069f2..4f9b49217c3 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp @@ -7,16 +7,17 @@ CIAO::Config_Handlers::BaseTypes_Handler::BaseTypes_Handler() CIAO::Config_Handlers::BaseTypes_Handler::~BaseTypes_Handler() {} +// @@ Jules, is this documentationin the C++ required at all? + ///This method takes a <XMLSchema::string> ///and returns a duplicate char* that is -///created with CORBA::string_dup. -char* +///created with CORBA::string_dup. +char* CIAO::Config_Handlers::BaseTypes_Handler::get_string (XMLSchema::string<char>& desc) { //Convert duplicate the XMLSchema::string into //a char*. The caller receives ownership of the pointer. - char* str = CORBA::string_dup(desc.c_str()); - + char* str = CORBA::string_dup (desc.c_str()); + return str; } - diff --git a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h index 904cc7a99f7..bd2382fc1e2 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h @@ -12,49 +12,49 @@ #define BaseTypes_HANDLER_H #include /**/ "ace/pre.h" - + #include "ciao/DeploymentC.h" #include "Basic_Deployment_Data.hpp" - - + + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// @@ Jules, what do we achieve by this class Gains seem low to me.. namespace CIAO{ - + namespace Config_Handlers{ /* * @class BaseTypes_Handler - * + * * @brief Handler class for <ComponentInterfaceDescription> types. - * - * This class defines handler methods to map values from + * + * This class defines handler methods to map values from * XSC Any objects, parsed from the descriptor files, to the * corresponding CORBA IDL Any type. - * + * */ - + class BaseTypes_Handler{ - + public: - + BaseTypes_Handler(); virtual ~BaseTypes_Handler(); - + ///This method takes a <XMLSchema::string> ///and returns a duplicate char* that is - ///created with CORBA::string_dup. + ///created with CORBA::string_dup. static char* get_string (XMLSchema::string<char>& desc); - + }; } - + } #include /**/ "ace/post.h" #endif /* BaseTypes_HANDLER_H */ - diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h index 6ba7b654910..3cbbdd8cb43 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/CPD_Handler.h @@ -12,41 +12,42 @@ #define CPD_HANDLER_H #include /**/ "ace/pre.h" - + #include "ciao/DeploymentC.h" #include "Basic_Deployment_Data.hpp" - - + + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ namespace CIAO{ - + namespace Config_Handlers{ /* * @class CPD_Handler - * + * * @brief Handler class for <CCMComponentPortDescription> types. - * - * This class defines handler methods to map values from + * + * 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 CPD_Handler{ - + class CPD_Handler + { + public: - + CPD_Handler (void); virtual ~CPD_Handler (void); - + ///This method maps the values from the ///XSC object <ComponentInterfaceDescription> to - ///the CORBA IDL type <Deployment::ComponentInterfaceDescription>. + ///the CORBA IDL type <Deployment::ComponentInterfaceDescription>. void get_ComponentPortDescription ( Deployment::ComponentPortDescription& toconfig, diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h index ade659c667d..dc23e2a4572 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h @@ -12,41 +12,43 @@ #define COMPONENTPROPERTYDESCRIPTION_HANDLER_H #include /**/ "ace/pre.h" - + #include "ciao/DeploymentC.h" #include "Basic_Deployment_Data.hpp" - - + + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ namespace CIAO{ - + namespace Config_Handlers{ /* * @class ComponentPropertyDescription_Handler - * + * * @brief Handler class for <ComponentPortDescription> types. - * - * This class defines handler methods to map values from + * + * 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. - * + * */ + // @@ Jules, all of the classes require the export macro to be usable. + class ComponentPropertyDescription_Handler{ - + public: - + ComponentPropertyDescription_Handler (void); virtual ~ComponentPropertyDescription_Handler (void); - + ///This method maps the values from the ///XSC object <ComponentPropertyDescription> to - ///the CORBA IDL type <Deployment::ComponentPropertyDescription>. + ///the CORBA IDL type <Deployment::ComponentPropertyDescription>. void get_ComponentPropertyDescription ( Deployment::ComponentPropertyDescription& toconfig, |