diff options
Diffstat (limited to 'TAO/CIAO')
49 files changed, 1351 insertions, 1402 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 76e0c4ecf02..9a09cf0140a 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1272,6 +1272,99 @@ Wed Feb 1 21:21:35 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> Wed Feb 1 20:42:42 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.h + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * tools/Config_Handlers/Utils/Functors.h + + Introduced a workaround for a ICE in GCC 4.0.22. + +Wed Apr 26 13:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/DP_Handler.cpp: + * tools/Config_Handlers/XML_File_Intf.cpp: + * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp: + * tools/Config_Handlers/XSCRT/XMLSchema.hpp: + * tools/Config_Handlers/XSCRT/Elements.hpp: + * tools/Config_Handlers/XSCRT/XML.hpp: + Removed workarounds for vc6 again + + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h: + Added missing post.h + + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h: + * tools/Config_Handlers/Package_Handlers/PC_Intf.h: + Fixed incorrect file tags + +Wed Apr 26 08:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/TargetManager/DomainDataManager.h: + Fixed compile problem in gcc4 build + +Tue Apr 25 21:27:05 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/TargetManager/TargetManager.mpc + + Linking problems for Borland. + + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + + More compile fixes for Borland. +Tue Apr 25 20:12:25 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.h + * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp + * DAnCE/NodeApplicationManager/Containers_Info_Map.h + * ciao/Deployment_Core.idl + * tools/Config_Handlers/ADD_Handler.cpp + * tools/Config_Handlers/CCD_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.h + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/DP_Handler.cpp + * tools/Config_Handlers/Deployment.hpp + * tools/Config_Handlers/ERE_Handler.cpp + * tools/Config_Handlers/ERE_Handler.h + * tools/Config_Handlers/MDD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.h + * tools/Config_Handlers/Property_Handler.cpp + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/Req_Handler.cpp + * tools/Config_Handlers/Req_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.cpp + * tools/Config_Handlers/SatisfierProperty_Handler.h + * tools/Config_Handlers/cdp.hpp + * tools/Config_Handlers/toplevel.hpp + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.h + + Compilation fixes for borland, some cosmetic fixes as well. + +Tue Apr 25 09:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/CPD_Handler.h: + ComponentPortDescription is a struct, so also forward declare it + as a struct + +Mon Apr 24 18:53:22 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + * CIDLC/ServantSourceGenerator.cpp Fixed a code generation problem caused by careless merging. diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 5edb7a51b3a..0cd1d7954b2 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -413,13 +413,13 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name "CIAO::NodeApplication_Impl::passivate_component, " "invalid instance [%s] \n", name)); - ACE_TRY_THROW (Deployment::StartError ()); + ACE_TRY_THROW (Components::RemoveFailure ()); } if (CORBA::is_nil (comp_state.objref_.in ())) { ACE_DEBUG ((LM_DEBUG, "comp is nil\n")); - throw Deployment::StartError (); + throw Components::RemoveFailure (); } comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -430,7 +430,7 @@ void CIAO::NodeApplication_Impl::activate_component (const char * name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((::CORBA::SystemException, - ::Components::RemoveFailure)) + ::Deployment::StartError)) { Component_State_Info comp_state; @@ -438,7 +438,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name { ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) - NodeApplication_Impl.cpp, " - "CIAO::NodeApplication_Impl::passivate_component, " + "CIAO::NodeApplication_Impl::activate_component, " "invalid instance [%s] \n", name)); ACE_TRY_THROW (Deployment::StartError ()); diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h index 8a08e3456c5..ee1878ff07d 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h @@ -183,7 +183,7 @@ namespace CIAO virtual void activate_component (const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((::CORBA::SystemException, - ::Components::RemoveFailure)); + ::Deployment::StartError)); virtual void passivate_component (const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS) diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index df31c704651..352a005515a 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -272,9 +272,11 @@ namespace CIAO // For svnt/exec artifacts for (CORBA::ULong j = 0; j < artifact_num; ++j) { - const Deployment::ArtifactDeploymentDescription & arti = + Deployment::ArtifactDeploymentDescription arti = this->plan_.artifact[ impl.artifactRef[j] ]; + // @Stoyan: Is there any particular reason the repository + // manager should only work on Windows? -Will #if defined (ACE_WIN32) || defined (ACE_WIN64) for (size_t loc_num = 0; loc_num < arti.location.length (); @@ -292,8 +294,11 @@ namespace CIAO "Containers_Info_Map::insert_instance_into_container -" "ERROR: Unable to resolve HTTP ref to location[%d] of %s\n", loc_num, arti.name.in ())); - - arti.location[loc_num] = CORBA::string_dup ("HTTP_failure"); + + // @Stoyan: This is an inappropriate response to + // this type of failure. Please throw an + // exception, Deployment::UnknownImplId would be appropriate. + arti.location[loc_num] = "HTTP_failure"; } else { diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h index 4fb23a46f19..a60cbe662b3 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h @@ -87,7 +87,10 @@ namespace CIAO * any references to HTTP URLs */ protected: - + + // @Stoyan - Please follow ACE coding guideines when naming your + //member variables. In particular, please use lower case and + //follow the name with a trailing underscore. //directory in which to download the libraries obtained via HTTP ACE_CString HTTP_DOWNLOAD_PATH; diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h index 84e50a5fabf..ea704259a0e 100644 --- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h +++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h @@ -201,10 +201,9 @@ namespace CIAO * @param available The available Properties */ - void CIAO::DomainDataManager:: - match_properties ( - ::Deployment::Properties deployed, - ::Deployment::SatisfierProperties& available); + void match_properties ( + ::Deployment::Properties deployed, + ::Deployment::SatisfierProperties& available); /// The different actiona that can take place diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc index b5a7aaa5458..07200eb0eca 100644 --- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -22,7 +22,7 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub { project(CIAO_TargetManager_svnt) : ciao_servant_dnc { after += CIAO_TargetManager_stub sharedname = TargetManager_svnt - libs += TargetManager_stub + libs += TargetManager_stub NodeManager_stub idlflags += -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL @@ -47,7 +47,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc { project(CIAO_TargetManager_exec) : ciao_servant_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc { after += CIAO_TargetManager_svnt sharedname = TargetManager_exec - libs += TargetManager_stub TargetManager_svnt + libs += TargetManager_stub TargetManager_svnt NodeManager_stub idlflags += -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h dynamicflags = TARGETMANAGER_EXEC_BUILD_DLL diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl index bfb58b6e2c8..6f0a465f7e2 100644 --- a/TAO/CIAO/ciao/Deployment_Core.idl +++ b/TAO/CIAO/ciao/Deployment_Core.idl @@ -284,7 +284,7 @@ module Deployment /// CIAO specific extensions /// Activate a component instance from the NodeApplication void activate_component (in string inst_name) - raises (::Components::RemoveFailure); + raises (::Deployment::StartError); /// CIAO specific extensions /// Passivate a component instance from the NodeApplication diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp index 204bd665a70..0a81e4c4859 100644 --- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp @@ -84,8 +84,8 @@ namespace CIAO adcb != adce; ++adcb) { - Property_Handler::get_property ((*adcb), - dest.execParameter[len++]); + Property_Handler::handle_property ((*adcb), + dest.execParameter[len++]); } if (src.id_p ()) diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp index 70104131917..f7e4a7e82d3 100644 --- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp @@ -70,8 +70,8 @@ namespace CIAO pstart != pend; ++pstart) { - Property_Handler::get_property (*pstart, - toconfig.configProperty [pos++]); + Property_Handler::handle_property (*pstart, + toconfig.configProperty [pos++]); } pos = 0; @@ -81,8 +81,7 @@ namespace CIAO port != desc.end_port (); ++port) { - CPD_Handler::component_port_description ( - *port, + CPD_Handler::handle_component_port_description (*port, toconfig.port[pos++]); } @@ -105,9 +104,8 @@ namespace CIAO infoProp != desc.end_infoProperty(); infoProp++) { - Property_Handler::get_property ( - *infoProp, - toconfig.infoProperty[pos]); + Property_Handler::handle_property (*infoProp, + toconfig.infoProperty[pos]); } } diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp index b061c426987..3131ce5735b 100644 --- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp @@ -24,13 +24,13 @@ namespace CIAO eeci_b != eeci_e; ++eeci_b) { - CEPE_Handler::external_port_endpoint ((*eeci_b), + CEPE_Handler::handle_external_port_endpoint ((*eeci_b), dest[pos++]); } } void - CEPE_Handler::external_port_endpoint ( + CEPE_Handler::handle_external_port_endpoint ( const ComponentExternalPortEndpoint &src, ::Deployment::ComponentExternalPortEndpoint &dest) { diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h index 681fcb1ec43..f0ba7f0d2fb 100644 --- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h @@ -1,11 +1,11 @@ //============================================================== /** -* @file CEPE_Handler.h -* -* $Id$ -* -* @author Jules White <jules@dre.vanderbilt.edu> -*/ + * @file CEPE_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ //================================================================ #ifndef CIAO_CONFIG_HANDLERS_CEPE_HANDLER_H @@ -21,48 +21,46 @@ namespace Deployment { -class ComponentExternalPortEndpoints; -struct ComponentExternalPortEndpoint; + class ComponentExternalPortEndpoints; + struct ComponentExternalPortEndpoint; } namespace CIAO { -namespace Config_Handlers -{ -class PlanConnectionDescription; -class ComponentExternalPortEndpoint; + namespace Config_Handlers + { + class PlanConnectionDescription; + class ComponentExternalPortEndpoint; -/* -* @class CEPE_Handler -* -* @brief Handler class for <ComponentExternalPortEndpoint> types. -* -* This class defines handler methods to map values from -* XSC ComponentExternalPortEndpoint objects, parsed from -* the descriptor files, to the corresponding CORBA IDL type. -* -*/ + /* + * @class CEPE_Handler + * + * @brief Handler class for <ComponentExternalPortEndpoint> types. + * + * This class defines handler methods to map values from + * XSC ComponentExternalPortEndpoint objects, parsed from + * the descriptor files, to the corresponding CORBA IDL type. + * + */ -class Config_Handlers_Export CEPE_Handler -{ -public: -static void external_port_endpoints ( -const PlanConnectionDescription &src, -::Deployment::ComponentExternalPortEndpoints &dest); + class Config_Handlers_Export CEPE_Handler + { + public: + static void external_port_endpoints (const PlanConnectionDescription &src, + ::Deployment::ComponentExternalPortEndpoints &dest); -static ComponentExternalPortEndpoint -external_port_endpoint ( -const ::Deployment::ComponentExternalPortEndpoint &src); + static ComponentExternalPortEndpoint + external_port_endpoint (const ::Deployment::ComponentExternalPortEndpoint &src); -static void external_port_endpoint (const ComponentExternalPortEndpoint &src, -::Deployment::ComponentExternalPortEndpoint &dest); -}; + static void handle_external_port_endpoint (const ComponentExternalPortEndpoint &src, + ::Deployment::ComponentExternalPortEndpoint &dest); + }; -typedef Sequence_Handler < ComponentExternalPortEndpoint, -::Deployment::ComponentExternalPortEndpoints, -::Deployment::ComponentExternalPortEndpoint, -CEPE_Handler::external_port_endpoint > CEPE_Functor; -} + typedef Sequence_Handler < ComponentExternalPortEndpoint, + ::Deployment::ComponentExternalPortEndpoints, + ::Deployment::ComponentExternalPortEndpoint, + CEPE_Handler::handle_external_port_endpoint > CEPE_Functor; + } } #include /**/ "ace/post.h" diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp index 67fcc0901c6..0b7b54d1adf 100644 --- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp @@ -10,7 +10,7 @@ namespace CIAO namespace Config_Handlers { void - CPD_Handler::component_port_description ( + CPD_Handler::handle_component_port_description ( const ComponentPortDescription& desc, Deployment::ComponentPortDescription& toconfig) { 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" diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc index e4f3bb21e66..da9f5d0ba3e 100644 --- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc +++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc @@ -1,11 +1,6 @@ //$Id$ project (XSC_XML_Handlers) : acelib, xerces { - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - sharedname += XSC_XML_Handlers dynamicflags = XSC_XML_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS @@ -28,14 +23,13 @@ project (XSC_XML_Handlers) : acelib, xerces { Header_Files { XSC_XML_Handlers_Export.h } -} - -project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory { verbatim(gnuace, macros) { override no_hidden_visibility = 1 } +} +project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory { after += CIAO_Events_Handlers RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler sharedname = XSC_Config_Handlers dynamicflags = CONFIG_HANDLERS_BUILD_DLL @@ -82,6 +76,10 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typeco Header_Files { Config_Handlers_Export.h } + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } } project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client { diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp index fb66b16fa41..0953c705cd5 100644 --- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp @@ -1,8 +1,4 @@ -#if defined (_MSC_VER) && (_MSC_VER < 1300) -#pragma warning (disable: 4018) -#pragma warning (disable: 4284) -#pragma warning (disable: 4146) -#endif +// $Id$ #include "DP_Handler.h" #include "ace/UUID.h" @@ -175,7 +171,7 @@ ACE_RCSID (Config_Handlers, } else { - Property_Handler::get_property (*pstart, + Property_Handler::handle_property (*pstart, this->idl_dp_->infoProperty [len]); } } diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp index 6c6cea3596f..ca6cf839a75 100644 --- a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp +++ b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp @@ -1,13 +1,13 @@ /* $Id$ -* This code was generated by the XML Schema Compiler. -* -* Changes made to this code will most likely be overwritten -* when the handlers are recompiled. -* -* If you find errors or feel that there are bugfixes to be made, -* please contact the current XSC maintainer: -* Will Otte <wotte@dre.vanderbilt.edu> -*/ + * This code was generated by the XML Schema Compiler. + * + * Changes made to this code will most likely be overwritten + * when the handlers are recompiled. + * + * If you find errors or feel that there are bugfixes to be made, + * please contact the current XSC maintainer: + * Will Otte <wotte@dre.vanderbilt.edu> + */ // Fix for Borland compilers, which seem to have a broken @@ -24,9 +24,9 @@ // namespace CIAO { -namespace Config_Handlers -{ -} + namespace Config_Handlers + { + } } #include <memory> @@ -45,109 +45,109 @@ namespace Config_Handlers namespace CIAO { -namespace Config_Handlers -{ -} + namespace Config_Handlers + { + } } namespace CIAO { -namespace Config_Handlers -{ -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::Domain -domain (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::DeploymentPlan -deploymentPlan (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::ImplementationArtifactDescription -implementationArtifactDescription (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::ComponentInterfaceDescription -componentInterfaceDescription (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::ComponentImplementationDescription -componentImplementationDescription (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::ComponentPackageDescription -componentPackageDescription (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::PackageConfiguration -packageConfiguration (xercesc::DOMDocument const*); - -XSC_XML_Handlers_Export -::CIAO::Config_Handlers::TopLevelPackageDescription -topLevelPackageDescription (xercesc::DOMDocument const*); -} + namespace Config_Handlers + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::Domain + domain (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::DeploymentPlan + deploymentPlan (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ImplementationArtifactDescription + implementationArtifactDescription (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ComponentInterfaceDescription + componentInterfaceDescription (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ComponentImplementationDescription + componentImplementationDescription (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ComponentPackageDescription + componentPackageDescription (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::PackageConfiguration + packageConfiguration (xercesc::DOMDocument const*); + + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::TopLevelPackageDescription + topLevelPackageDescription (xercesc::DOMDocument const*); + } } #include "XMLSchema/Traversal.hpp" namespace CIAO { -namespace Config_Handlers -{ -namespace Traversal -{ -} -} + namespace Config_Handlers + { + namespace Traversal + { + } + } } #include "XMLSchema/Writer.hpp" namespace CIAO { -namespace Config_Handlers -{ -namespace Writer -{ -} -} + namespace Config_Handlers + { + namespace Writer + { + } + } } namespace CIAO { -namespace Config_Handlers -{ -XSC_XML_Handlers_Export -void -domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*); - -XSC_XML_Handlers_Export -void -topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*); -} + namespace Config_Handlers + { + XSC_XML_Handlers_Export + void + domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*); + + XSC_XML_Handlers_Export + void + topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*); + } } #endif // DEPLOYMENT_HPP diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp index 200282aa792..d64528cfdeb 100644 --- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp @@ -24,13 +24,13 @@ namespace CIAO erep_b != erep_e; ++erep_b) { - ERE_Handler::external_ref_endpoint ((*erep_b), + ERE_Handler::handle_external_ref_endpoint ((*erep_b), dest[pos++]); } } void - ERE_Handler::external_ref_endpoint ( + ERE_Handler::handle_external_ref_endpoint ( const ExternalReferenceEndpoint &src, Deployment::ExternalReferenceEndpoint &dest) { diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h index 934e2273bf5..c3bad772118 100644 --- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h @@ -1,11 +1,11 @@ //============================================================== /** -* @file ERE_Handler.h -* -* $Id$ -* -* @author Jules White <jules@dre.vanderbilt.edu> -*/ + * @file ERE_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ //================================================================ #ifndef CIAO_CONFIG_HANDLERS_ERE_HANDLER_H @@ -22,49 +22,48 @@ namespace Deployment { -class ExternalReferenceEndpoints; -struct ExternalReferenceEndpoint; + class ExternalReferenceEndpoints; + struct ExternalReferenceEndpoint; } namespace CIAO { -namespace Config_Handlers -{ -class PlanConnectionDescription; -class ExternalReferenceEndpoint; + namespace Config_Handlers + { + class PlanConnectionDescription; + class ExternalReferenceEndpoint; -/* -* @class ERE_Handler -* -* @brief Handler class for <ExternalReferenceEndpoint> types. -* -* This class defines handler methods to map values from -* XSC ExternalReferenceEndpoint objects, parsed from -* the descriptor files, to the corresponding CORBA IDL type. -* -*/ + /* + * @class ERE_Handler + * + * @brief Handler class for <ExternalReferenceEndpoint> types. + * + * This class defines handler methods to map values from + * XSC ExternalReferenceEndpoint objects, parsed from + * the descriptor files, to the corresponding CORBA IDL type. + * + */ -class Config_Handlers_Export ERE_Handler -{ -public: -static void external_ref_endpoints ( -const PlanConnectionDescription &src, -::Deployment::ExternalReferenceEndpoints &dest); + class Config_Handlers_Export ERE_Handler + { + public: + static void external_ref_endpoints (const PlanConnectionDescription &src, + ::Deployment::ExternalReferenceEndpoints &dest); -static ExternalReferenceEndpoint external_ref_endpoint ( -const Deployment::ExternalReferenceEndpoint& src); + static ExternalReferenceEndpoint external_ref_endpoint ( + const Deployment::ExternalReferenceEndpoint& src); -static void external_ref_endpoint (const ExternalReferenceEndpoint &src, -Deployment::ExternalReferenceEndpoint &dest); -}; + static void handle_external_ref_endpoint (const ExternalReferenceEndpoint &src, + Deployment::ExternalReferenceEndpoint &dest); + }; -typedef Sequence_Handler < ExternalReferenceEndpoint, -::Deployment::ExternalReferenceEndpoints, -::Deployment::ExternalReferenceEndpoint, -ERE_Handler::external_ref_endpoint > ERE_Functor; + typedef Sequence_Handler < ExternalReferenceEndpoint, + ::Deployment::ExternalReferenceEndpoints, + ::Deployment::ExternalReferenceEndpoint, + ERE_Handler::handle_external_ref_endpoint > ERE_Functor; -} + } } #include /**/ "ace/post.h" diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp index 9006956d2de..c86d6dc1da1 100644 --- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp @@ -87,7 +87,7 @@ namespace CIAO epcb != epce; ++epcb) { - Property_Handler::get_property ((*epcb), + Property_Handler::handle_property ((*epcb), toconfig.execParameter[len++]); } diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp index bcb5e4d917c..23b332d471e 100644 --- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp @@ -26,7 +26,7 @@ namespace CIAO ///This method takes a <Deployment::PlanConnectionDescription> ///and maps the values from the passed in XSC ///PlanConnectionDescription to its members. - void PCD_Handler::get_PlanConnectionDescription (const PlanConnectionDescription& desc, + void PCD_Handler::handle_PlanConnectionDescription (const PlanConnectionDescription& desc, Deployment::PlanConnectionDescription& toconfig) { CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription"); diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h index edac698d7b6..7b852203f60 100644 --- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h @@ -53,7 +53,7 @@ namespace CIAO ///This method takes a <Deployment::PlanConnectionDescription> ///and maps the values from the passed in XSC ///PlanConnectionDescription to its members. - static void get_PlanConnectionDescription (const PlanConnectionDescription& desc, + static void handle_PlanConnectionDescription (const PlanConnectionDescription& desc, Deployment::PlanConnectionDescription& toconfig); //This method takes a <Deployment::PlanConnectionDescription> @@ -66,7 +66,7 @@ namespace CIAO typedef Sequence_Handler < PlanConnectionDescription, ::Deployment::PlanConnectionDescriptions, ::Deployment::PlanConnectionDescription, - PCD_Handler::get_PlanConnectionDescription > PCD_Functor; + PCD_Handler::handle_PlanConnectionDescription > PCD_Functor; } } diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp index d9756f3c07f..ec3bb20e539 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp @@ -21,7 +21,7 @@ namespace CIAO { struct SPE_Handler { - static void get_spe (const SubcomponentPortEndpoint &desc, + static void handle_spe (const SubcomponentPortEndpoint &desc, ::Deployment::SubcomponentPortEndpoint &toconfig) { CIAO_TRACE("SPE_Handler::get_spe"); @@ -50,11 +50,11 @@ namespace CIAO typedef Sequence_Handler < SubcomponentPortEndpoint, ::Deployment::SubcomponentPortEndpoints, ::Deployment::SubcomponentPortEndpoint, - SPE_Handler::get_spe > SPE_Functor; + SPE_Handler::handle_spe > SPE_Functor; struct ACD_Handler { - static void get_acd (const AssemblyConnectionDescription &desc, + static void handle_acd (const AssemblyConnectionDescription &desc, ::Deployment::AssemblyConnectionDescription &toconfig) { CIAO_TRACE("ACD_Handler::get_acd"); @@ -67,6 +67,9 @@ namespace CIAO Requirement_Functor (toconfig.deployRequirement)); toconfig.internalEndpoint.length (desc.count_internalEndpoint ()); + SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe, + desc.begin_internalEndpoint (), + toconfig.internalEndpoint); std::for_each (desc.begin_internalEndpoint (), desc.end_internalEndpoint (), SPE_Functor (toconfig.internalEndpoint)); @@ -113,12 +116,12 @@ namespace CIAO typedef Sequence_Handler < AssemblyConnectionDescription, ::Deployment::AssemblyConnectionDescriptions, ::Deployment::AssemblyConnectionDescription, - ACD_Handler::get_acd > ACD_Functor; + ACD_Handler::handle_acd > ACD_Functor; struct SPR_Handler { - static void get_spr (const SubcomponentPropertyReference &desc, + static void handle_spr (const SubcomponentPropertyReference &desc, ::Deployment::SubcomponentPropertyReference &toconfig) { CIAO_TRACE("SPR_Handler::get_spr"); @@ -149,11 +152,11 @@ namespace CIAO typedef Sequence_Handler < SubcomponentPropertyReference, ::Deployment::SubcomponentPropertyReferences, ::Deployment::SubcomponentPropertyReference, - SPR_Handler::get_spr > SPR_Functor; + SPR_Handler::handle_spr > SPR_Functor; struct APM_Handler { - static void get_apm (const AssemblyPropertyMapping &desc, + static void handle_apm (const AssemblyPropertyMapping &desc, ::Deployment::AssemblyPropertyMapping &toconfig) { CIAO_TRACE("APM_Handler::get_apm"); @@ -162,6 +165,9 @@ namespace CIAO toconfig.externalName = desc.externalName ().c_str (); toconfig.delegatesTo.length (desc.count_delegatesTo ()); + SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr, + desc.begin_delegatesTo (), + toconfig.delegatesTo); std::for_each (desc.begin_delegatesTo (), desc.end_delegatesTo (), SPR_Functor (toconfig.delegatesTo)); @@ -185,7 +191,7 @@ namespace CIAO typedef Sequence_Handler < AssemblyPropertyMapping, ::Deployment::AssemblyPropertyMappings, ::Deployment::AssemblyPropertyMapping, - APM_Handler::get_apm > APM_Functor; + APM_Handler::handle_apm > APM_Functor; } @@ -204,11 +210,17 @@ namespace CIAO /* @@ MAJO: Implement Locality */ toconfig.connection.length (desc.count_connection ()); + SEQ_HAND_GCC_BUG_WORKAROUND (ACD_Handler::handle_acd, + desc.begin_connection (), + toconfig.connection); std::for_each (desc.begin_connection (), desc.end_connection (), ACD_Functor (toconfig.connection)); toconfig.externalProperty.length (desc.count_externalProperty ()); + SEQ_HAND_GCC_BUG_WORKAROUND (APM_Handler::handle_apm, + desc.begin_externalProperty (), + toconfig.externalProperty); std::for_each (desc.begin_externalProperty (), desc.end_externalProperty (), APM_Functor (toconfig.externalProperty)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp index 782027a38fb..d5e39d485da 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp @@ -27,218 +27,222 @@ namespace CIAO IDREF_Base<CORBA::ULong> CID_Handler::IDREF; - namespace + struct Capability_Handler { - struct Capability_Handler - { - static void get_capability (const Capability &desc, - ::Deployment::Capability &toconfig) - { - CIAO_TRACE ("Capability_Handler::get_capability"); - - toconfig.name = desc.name ().c_str (); - - toconfig.resourceType.length (desc.count_resourceType ()); - std::for_each (desc.begin_resourceType (), - desc.end_resourceType (), - String_Seq_Functor (toconfig.resourceType)); - - toconfig.property.length (desc.count_property ()); - std::for_each (desc.begin_property (), - desc.end_property (), - SatisfierProperty_Functor (toconfig.property)); - } - - static Capability get_capability (const ::Deployment::Capability &src) - { - CIAO_TRACE ("Capability_Handler::get_capability - reverse"); - - Capability retval (src.name.in ()); - - for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i) - retval.add_resourceType (src.resourceType[i]); - - for (CORBA::ULong i = 0; i < src.property.length (); ++i) - retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i])); - - return retval; - } - }; - - typedef Sequence_Handler < Capability, - ::Deployment::Capabilities, - ::Deployment::Capability, - Capability_Handler::get_capability > Capability_Functor; - - struct IR_Handler - { - static void get_ir (const ImplementationRequirement &desc, - ::Deployment::ImplementationRequirement &toconfig) - { - CIAO_TRACE ("IR_Handler::get_ir"); - - if (desc.resourceUsage_p ()) - { - switch (desc.resourceUsage ().integral ()) - { - case ResourceUsageKind::None_l: - toconfig.resourceUsage = Deployment::None; - break; - - case ResourceUsageKind::InstanceUsesResource_l: - toconfig.resourceUsage = Deployment::InstanceUsesResource; - break; - - case ResourceUsageKind::ResourceUsesInstance_l: - toconfig.resourceUsage = Deployment::ResourceUsesInstance; - break; - - case ResourceUsageKind::PortUsesResource_l: - toconfig.resourceUsage = Deployment::PortUsesResource; - break; - - case ResourceUsageKind::ResourceUsesPort_l: - toconfig.resourceUsage = Deployment::ResourceUsesPort; - break; - - default: - throw Config_Error (desc.name (), - "Unknown ResourceUsageKind."); - break; - } - } - - if (desc.resourcePort_p ()) - toconfig.resourcePort = desc.resourcePort ().c_str (); - - if (desc.componentPort_p ()) - toconfig.componentPort = desc.componentPort ().c_str (); - - toconfig.resourceType = desc.resourceType ().c_str (); - toconfig.name = desc.name ().c_str (); - - std::for_each (desc.begin_property (), - desc.end_property (), - Property_Functor (toconfig.property )); - } - - static ImplementationRequirement - get_ir (const ::Deployment::ImplementationRequirement &src) - { - CIAO_TRACE ("IR_Handler::get_ir - reverse"); - - ImplementationRequirement retval (src.resourceType.in (), - src.name.in ()); - - if (src.resourceUsage.length () == 1) - switch (src.resourceUsage[0]) - { - case Deployment::None: - retval.resourceUsage (ResourceUsageKind::None); - break; + static void handle_capability (const Capability &desc, + ::Deployment::Capability &toconfig) + { + CIAO_TRACE ("Capability_Handler::get_capability"); - case Deployment::InstanceUsesResource: - retval.resourceUsage (ResourceUsageKind::InstanceUsesResource); - break; + toconfig.name = desc.name ().c_str (); - case Deployment::ResourceUsesInstance: - retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance); - break; + toconfig.resourceType.length (desc.count_resourceType ()); + std::for_each (desc.begin_resourceType (), + desc.end_resourceType (), + String_Seq_Functor (toconfig.resourceType)); - case Deployment::PortUsesResource: - retval.resourceUsage (ResourceUsageKind::PortUsesResource); - break; + toconfig.property.length (desc.count_property ()); + std::for_each (desc.begin_property (), + desc.end_property (), + SatisfierProperty_Functor (toconfig.property)); + } - case Deployment::ResourceUsesPort: - retval.resourceUsage (ResourceUsageKind::ResourceUsesPort); - break; + static Capability get_capability (const ::Deployment::Capability &src) + { + CIAO_TRACE ("Capability_Handler::get_capability - reverse"); - default: - throw Config_Error (src.name.in (), - "Unknown ResourceUsageKind."); - break; - } + Capability retval (src.name.in ()); - retval.resourcePort (src.resourcePort.in ()); + for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i) + retval.add_resourceType (src.resourceType[i]); - retval.componentPort (src.componentPort.in ()); + for (CORBA::ULong i = 0; i < src.property.length (); ++i) + retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i])); - for (CORBA::ULong i = 0; i < src.property.length (); ++i) - retval.add_property (Property_Handler::get_property (src.property[i])); + return retval; + } + }; - return retval; - } - }; - - typedef Sequence_Handler < ImplementationRequirement, - ::Deployment::ImplementationRequirements, - ::Deployment::ImplementationRequirement, - IR_Handler::get_ir > IR_Functor; - - - - struct MID_Handler - { - static void get_mid (const MonolithicImplementationDescription &desc, - ::Deployment::MonolithicImplementationDescription &toconfig) - { - CIAO_TRACE ("MID_Handler::get_mid"); - - toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ()); - std::for_each (desc.begin_nodeExecParameter (), - desc.end_nodeExecParameter (), - Property_Functor (toconfig.nodeExecParameter)); - - toconfig.componentExecParameter.length (desc.count_componentExecParameter ()); - std::for_each (desc.begin_componentExecParameter (), - desc.end_componentExecParameter (), - Property_Functor (toconfig.componentExecParameter)); - - toconfig.deployRequirement.length (desc.count_deployRequirement ()); - std::for_each (desc.begin_deployRequirement (), - desc.end_deployRequirement (), - IR_Functor (toconfig.deployRequirement)); - - toconfig.primaryArtifact.length (desc.count_primaryArtifact ()); - std::for_each (desc.begin_primaryArtifact (), - desc.end_primaryArtifact (), - NIA_Functor (toconfig.primaryArtifact)); - } - - static MonolithicImplementationDescription - get_mid (const ::Deployment::MonolithicImplementationDescription &src) - { - CIAO_TRACE ("MID_Handler::get_mid - reverse"); - - MonolithicImplementationDescription retval; + typedef Sequence_Handler < Capability, + ::Deployment::Capabilities, + ::Deployment::Capability, + Capability_Handler::handle_capability > Capability_Functor; - for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i) - retval.add_nodeExecParameter - (Property_Handler::get_property (src.nodeExecParameter[i])); - - for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i) - retval.add_componentExecParameter - (Property_Handler::get_property (src.componentExecParameter[i])); - - for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) - retval.add_deployRequirement - (IR_Handler::get_ir (src.deployRequirement[i])); - - for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i) - retval.add_primaryArtifact - (NIA_Handler::get_nia (src.primaryArtifact[i])); - - return retval; - } - - }; - - typedef Sequence_Handler < MonolithicImplementationDescription, - ::Deployment::MonolithicImplementationDescriptions, - ::Deployment::MonolithicImplementationDescription, - MID_Handler::get_mid > MID_Functor; - - } + struct IR_Handler + { + static void handle_ir (const ImplementationRequirement &desc, + ::Deployment::ImplementationRequirement &toconfig) + { + CIAO_TRACE ("IR_Handler::get_ir"); + + if (desc.resourceUsage_p ()) + { + switch (desc.resourceUsage ().integral ()) + { + case ResourceUsageKind::None_l: + toconfig.resourceUsage = Deployment::None; + break; + + case ResourceUsageKind::InstanceUsesResource_l: + toconfig.resourceUsage = Deployment::InstanceUsesResource; + break; + + case ResourceUsageKind::ResourceUsesInstance_l: + toconfig.resourceUsage = Deployment::ResourceUsesInstance; + break; + + case ResourceUsageKind::PortUsesResource_l: + toconfig.resourceUsage = Deployment::PortUsesResource; + break; + + case ResourceUsageKind::ResourceUsesPort_l: + toconfig.resourceUsage = Deployment::ResourceUsesPort; + break; + + default: + throw Config_Error (desc.name (), + "Unknown ResourceUsageKind."); + break; + } + } + + if (desc.resourcePort_p ()) + toconfig.resourcePort = desc.resourcePort ().c_str (); + + if (desc.componentPort_p ()) + toconfig.componentPort = desc.componentPort ().c_str (); + + toconfig.resourceType = desc.resourceType ().c_str (); + toconfig.name = desc.name ().c_str (); + + std::for_each (desc.begin_property (), + desc.end_property (), + Property_Functor (toconfig.property )); + } + + static ImplementationRequirement + get_ir (const ::Deployment::ImplementationRequirement &src) + { + CIAO_TRACE ("IR_Handler::get_ir - reverse"); + + ImplementationRequirement retval (src.resourceType.in (), + src.name.in ()); + + if (src.resourceUsage.length () == 1) + switch (src.resourceUsage[0]) + { + case Deployment::None: + retval.resourceUsage (ResourceUsageKind::None); + break; + + case Deployment::InstanceUsesResource: + retval.resourceUsage (ResourceUsageKind::InstanceUsesResource); + break; + + case Deployment::ResourceUsesInstance: + retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance); + break; + + case Deployment::PortUsesResource: + retval.resourceUsage (ResourceUsageKind::PortUsesResource); + break; + + case Deployment::ResourceUsesPort: + retval.resourceUsage (ResourceUsageKind::ResourceUsesPort); + break; + + default: + throw Config_Error (src.name.in (), + "Unknown ResourceUsageKind."); + break; + } + + retval.resourcePort (src.resourcePort.in ()); + + retval.componentPort (src.componentPort.in ()); + + for (CORBA::ULong i = 0; i < src.property.length (); ++i) + retval.add_property (Property_Handler::get_property (src.property[i])); + + return retval; + } + }; + + typedef Sequence_Handler < ImplementationRequirement, + ::Deployment::ImplementationRequirements, + ::Deployment::ImplementationRequirement, + IR_Handler::handle_ir > IR_Functor; + + struct MID_Handler + { + static void handle_mid (const MonolithicImplementationDescription &desc, + ::Deployment::MonolithicImplementationDescription &toconfig) + { + CIAO_TRACE ("MID_Handler::get_mid"); + + toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ()); + std::for_each (desc.begin_nodeExecParameter (), + desc.end_nodeExecParameter (), + Property_Functor (toconfig.nodeExecParameter)); + + toconfig.componentExecParameter.length (desc.count_componentExecParameter ()); + std::for_each (desc.begin_componentExecParameter (), + desc.end_componentExecParameter (), + Property_Functor (toconfig.componentExecParameter)); + + toconfig.deployRequirement.length (desc.count_deployRequirement ()); + while (0) + { + IR_Handler::handle_ir (*desc.begin_deployRequirement (), + toconfig.deployRequirement[0]); + } + std::for_each (desc.begin_deployRequirement (), + desc.end_deployRequirement (), + IR_Functor (toconfig.deployRequirement)); + + toconfig.primaryArtifact.length (desc.count_primaryArtifact ()); + SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia, + desc.begin_primaryArtifact (), + toconfig.primaryArtifact); + std::for_each (desc.begin_primaryArtifact (), + desc.end_primaryArtifact (), + NIA_Functor (toconfig.primaryArtifact)); + } + + static MonolithicImplementationDescription + get_mid (const ::Deployment::MonolithicImplementationDescription &src) + { + CIAO_TRACE ("MID_Handler::get_mid - reverse"); + + MonolithicImplementationDescription retval; + + for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i) + retval.add_nodeExecParameter + (Property_Handler::get_property (src.nodeExecParameter[i])); + + for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i) + retval.add_componentExecParameter + (Property_Handler::get_property (src.componentExecParameter[i])); + + for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) + retval.add_deployRequirement + (IR_Handler::get_ir (src.deployRequirement[i])); + + for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i) + retval.add_primaryArtifact + (NIA_Handler::get_nia (src.primaryArtifact[i])); + + return retval; + } + + }; + + typedef Sequence_Handler < MonolithicImplementationDescription, + ::Deployment::MonolithicImplementationDescriptions, + ::Deployment::MonolithicImplementationDescription, + MID_Handler::handle_mid > MID_Functor; + + void CID_Handler::component_impl_descr ( @@ -279,8 +283,8 @@ namespace CIAO else if (cid->monolithicImpl_p ()) { toconfig.monolithicImpl.length (1); - MID_Handler::get_mid (cid->monolithicImpl (), - toconfig.monolithicImpl[0]); + MID_Handler::handle_mid (cid->monolithicImpl (), + toconfig.monolithicImpl[0]); } else throw Plan_Error ("ComponentImplementationDescription must have either assemblyImpl or monolithicImpl"); @@ -293,6 +297,9 @@ namespace CIAO // capability toconfig.capability.length (cid->count_capability ()); + SEQ_HAND_GCC_BUG_WORKAROUND (Capability_Handler::handle_capability, + cid->begin_capability (), + toconfig.capability); std::for_each (cid->begin_capability (), cid->end_capability (), Capability_Functor (toconfig.capability)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp index dc3976ce698..f7c37953b97 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO { struct PCI_Handler { - static void get_pci (const PackagedComponentImplementation &desc, + static void handle_pci (const PackagedComponentImplementation &desc, ::Deployment::PackagedComponentImplementation &toconfig) { CIAO_TRACE ("PCI_Handler::get_pci"); @@ -41,11 +41,11 @@ namespace CIAO typedef Sequence_Handler < PackagedComponentImplementation, ::Deployment::PackagedComponentImplementations, ::Deployment::PackagedComponentImplementation, - PCI_Handler::get_pci > PCI_Functor; + PCI_Handler::handle_pci > PCI_Functor; } void - CPD_Handler::component_package_descr (const ComponentPackageDescription &desc, + CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc, ::Deployment::ComponentPackageDescription &toconfig) { CIAO_TRACE ("CPD_Handler::component_package_descr"); @@ -83,6 +83,9 @@ namespace CIAO // Packaged Component Implementations toconfig.implementation.length ( cpd->count_implementation ()); + SEQ_HAND_GCC_BUG_WORKAROUND (PCI_Handler::handle_pci, + cpd->begin_implementation (), + toconfig.implementation); std::for_each (cpd->begin_implementation (), cpd->end_implementation (), PCI_Functor (toconfig.implementation)); @@ -136,7 +139,7 @@ namespace CIAO { CIAO_TRACE ("CPD_Handler::resolve_cpd"); if (!XML_HELPER->is_initialized ()) - return false; + return 0; xercesc::DOMDocument* dom = XML_HELPER->create_dom (uri); 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; } diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp index ea487980046..801519dc987 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp @@ -16,11 +16,9 @@ namespace CIAO { namespace Packaging { - namespace - { struct Comp_Prop_Handler { - static void get_cpd (const ComponentPropertyDescription &desc, + static void handle_cpd (const ComponentPropertyDescription &desc, ::Deployment::ComponentPropertyDescription &toconfig) { CIAO_TRACE ("Comp_Prop_Handler::get_cpd"); @@ -44,8 +42,8 @@ namespace CIAO typedef Sequence_Handler < ComponentPropertyDescription, ::Deployment::ComponentPropertyDescriptions, ::Deployment::ComponentPropertyDescription, - Comp_Prop_Handler::get_cpd > Comp_Prop_Functor; - } + Comp_Prop_Handler::handle_cpd > Comp_Prop_Functor; + void Comp_Intf_Descr_Handler::comp_intf_descr ( @@ -96,6 +94,9 @@ namespace CIAO CIAO::Config_Handlers::CPD_Functor (toconfig.port)); toconfig.property.length (cid->count_property ()); + SEQ_HAND_GCC_BUG_WORKAROUND (Comp_Prop_Handler::handle_cpd, + cid->begin_property (), + toconfig.property); std::for_each (cid->begin_property (), cid->end_property (), Comp_Prop_Functor (toconfig.property)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp index f77a5f092f1..c0010429df6 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp @@ -49,6 +49,9 @@ namespace CIAO String_Seq_Functor (toconfig.location)); toconfig.dependsOn.length (iad->count_dependsOn ()); + SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia, + desc.begin_dependsOn (), + toconfig.dependsOn); std::for_each (iad->begin_dependsOn (), iad->end_dependsOn (), NIA_Functor (toconfig.dependsOn)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h index 6ad2767104b..edc5fe7fa6c 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h @@ -34,7 +34,7 @@ namespace CIAO class Packaging_Handlers_Export NIA_Handler { public: - static void get_nia (const NamedImplementationArtifact &desc, + static void handle_nia (const NamedImplementationArtifact &desc, ::Deployment::NamedImplementationArtifact &toconfig) { toconfig.name = desc.name ().c_str (); @@ -55,10 +55,11 @@ namespace CIAO typedef Sequence_Handler < NamedImplementationArtifact, ::Deployment::NamedImplementationArtifacts, ::Deployment::NamedImplementationArtifact, - NIA_Handler::get_nia > NIA_Functor; + NIA_Handler::handle_nia > NIA_Functor; } } } +#include /**/ "ace/post.h" #endif /* CIAO_PACKAGING_NIA_HANDLER_H */ diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp index 922c1fac252..675060fd082 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -1,19 +1,19 @@ // $Id$ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "ciao/CIAO_common.h" +#include "ciao/Packaging_DataC.h" +#include "Utils/XML_Helper.h" +#include "Utils/XercesString.h" +#include "Utils/Exceptions.h" #include "Package_Handlers/PCD_Handler.h" #include "Package_Handlers/CPD_Handler.h" -#include "Basic_Deployment_Data.hpp" -#include "ciao/Packaging_DataC.h" #include "Deployment.hpp" #include "Property_Handler.h" #include "Req_Handler.h" -#include "Utils/XercesString.h" -#include "Utils/Exceptions.h" -#include <memory> -#include "ciao/CIAO_common.h" +#include "Basic_Deployment_Data.hpp" -#include <xercesc/util/XMLString.hpp> +#include <memory> namespace CIAO { @@ -25,13 +25,20 @@ namespace CIAO PCD_Handler::package_config (const ACE_TCHAR *uri, ::Deployment::PackageConfiguration &toconfig) { - xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri); + const xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri); + + if (dom == 0) + { + std::string error ("Unable to open file: "); + error += uri; + throw Parse_Error (error); + } - XStr root = dom->getDocumentElement ()->getTagName (); + XStr root = dom->getDocumentElement ()->getTagName (); if (root == XStr ("Deployment:topLevelPackageDescription")) { - TopLevelPackageDescription tpd (topLevelPackageDescription (dom)); + TopLevelPackageDescription tpd = topLevelPackageDescription (dom); PCD_Handler::package_config (tpd.package (), toconfig); } @@ -83,8 +90,8 @@ namespace CIAO if (pcd->basePackage_p ()) { toconfig.basePackage.length (1); - CPD_Handler::component_package_descr (pcd->basePackage (), - toconfig.basePackage [0]); + CPD_Handler::handle_component_package_descr (pcd->basePackage (), + toconfig.basePackage [0]); } // @@ MAJO: Support other elements present here. diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp index 334245559fa..e265295d040 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp @@ -1,11 +1,5 @@ // $Id$ -#if defined (_MSC_VER) && (_MSC_VER < 1300) -#pragma warning (disable: 4018) -#pragma warning (disable: 4284) -#pragma warning (disable: 4146) -#endif - #include "STD_PC_Intf.h" #include "Utils/XML_Helper.h" #include "Deployment.hpp" diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h index d280fb5c655..c15ae0389b9 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h @@ -1,6 +1,6 @@ //============================================================== /** - * @file STD_PC_Intf.h + * @file PC_Intf.h * * $Id$ * diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc index fce4f459738..e73d5790a70 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc @@ -29,6 +29,10 @@ project (Package_Config_Handlers) : acelib, ciao_deployment_stub, xerces { PCD_Handler.h SID_Handler.h } + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } } project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client { @@ -40,6 +44,9 @@ project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handle Source_Files { test.cpp } + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } } diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp index 4cca9747789..34eadf9ea32 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO IDREF_Base<CORBA::ULong> SID_Handler::IDREF; void - SID_Handler::sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, + SID_Handler::handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, ::Deployment::SubcomponentInstantiationDescription &toconfig) { CIAO_TRACE ("SID_Handler::sub_comp_inst_descr"); @@ -28,7 +28,7 @@ namespace CIAO if (desc.basePackage_p ()) { toconfig.basePackage.length (1); - CPD_Handler::component_package_descr (desc.basePackage (), + CPD_Handler::handle_component_package_descr (desc.basePackage (), toconfig.basePackage[0]); } else if (desc.specializedConfig_p ()) diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h index c166fcd6294..1bcb73e751e 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h @@ -43,7 +43,7 @@ namespace CIAO } public: - static void sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, + static void handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, ::Deployment::SubcomponentInstantiationDescription &toconfig); static SubcomponentInstantiationDescription @@ -61,7 +61,7 @@ namespace CIAO typedef Sequence_Handler < SubcomponentInstantiationDescription, ::Deployment::SubcomponentInstantiationDescriptions, ::Deployment::SubcomponentInstantiationDescription, - SID_Handler::sub_comp_inst_descr > SID_Functor; + SID_Handler::handle_sub_comp_inst_descr > SID_Functor; } } diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp index 273fe8c8e69..41129007618 100644 --- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO } void - Property_Handler::get_property ( + Property_Handler::handle_property ( const Property& desc, Deployment::Property& toconfig) { diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h index 07044faed8e..5180244465e 100644 --- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h @@ -1,11 +1,11 @@ //================================================ /** -* @file Property_Handler.h -* -* $Id$ -* -* @author Jules White <jules@dre.vanderbilt.edu> -*/ + * @file Property_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ //================================================ #ifndef CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H @@ -22,50 +22,49 @@ namespace Deployment { -struct Property; -class Properties; + struct Property; + class Properties; } namespace CIAO { -namespace Config_Handlers -{ -class Property; + namespace Config_Handlers + { + class Property; -/* -* @class Property_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 Property_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 Property_Handler -{ -public: -Property_Handler (void); -virtual ~Property_Handler (void); + class Config_Handlers_Export Property_Handler + { + public: + Property_Handler (void); + virtual ~Property_Handler (void); -typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter; + /// This method maps the values from the XSC object + /// <CIAO::Config_Handlers::Property> to the CORBA IDL type + /// <Deployment::Property>. + static void handle_property (const Property& desc, + ::Deployment::Property& toconfig); + static Property get_property ( + const ::Deployment::Property& src); + }; -/// This method maps the values from the XSC object -/// <CIAO::Config_Handlers::Property> to the CORBA IDL type -/// <Deployment::Property>. -static void get_property (const Property& desc, -::Deployment::Property& toconfig); -static Property get_property ( -const ::Deployment::Property& src); -}; -typedef Sequence_Handler < Property, -::Deployment::Properties, -::Deployment::Property, -Property_Handler::get_property> Property_Functor; + typedef Sequence_Handler < Property, + ::Deployment::Properties, + ::Deployment::Property, + Property_Handler::handle_property > Property_Functor; -} + } } #include /**/ "ace/post.h" diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp index 37fd441ac92..c20d5e428f2 100644 --- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp @@ -18,8 +18,8 @@ namespace CIAO } void - Req_Handler::get_requirement (const Requirement& desc, - Deployment::Requirement& toconfig) + Req_Handler::handle_requirement (const Requirement& desc, + Deployment::Requirement& toconfig) { CIAO_TRACE("Req_Handler::get_Requirement"); diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h index 315eee76579..be35f55e0a8 100644 --- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h @@ -1,11 +1,11 @@ //============================================================== /** -* @file Req_Handler.h -* -* $Id$ -* -* @author Jules White <jules@dre.vanderbilt.edu> -*/ + * @file Req_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ //================================================================ #ifndef CIAO_CONFIG_HANDLERS_REQ_HANDLER_H @@ -22,49 +22,49 @@ namespace Deployment { -struct Requirement; -class Requirements; + struct Requirement; + class Requirements; } namespace CIAO { -namespace Config_Handlers -{ -/* -* @class REQ_Handler -* -* @brief Handler class for <Requirement> types. -* -* This class defines handler methods to map values from -* XSC Requirement objects, parsed from -* the descriptor files, to the corresponding CORBA IDL type. -* -*/ + namespace Config_Handlers + { + /* + * @class REQ_Handler + * + * @brief Handler class for <Requirement> types. + * + * This class defines handler methods to map values from + * XSC Requirement objects, parsed from + * the descriptor files, to the corresponding CORBA IDL type. + * + */ -class Config_Handlers_Export Req_Handler -{ -public: + class Config_Handlers_Export Req_Handler + { + public: -Req_Handler (void); -virtual ~Req_Handler (void); + Req_Handler (void); + virtual ~Req_Handler (void); -///This method takes a <Deployment::Requirement> -///and maps the values from the passed in XSC -///Requirement to its members. -static void get_requirement (const Requirement& desc, -Deployment::Requirement& toconfig); -static Requirement -get_requirement (const Deployment::Requirement& src); -}; + ///This method takes a <Deployment::Requirement> + ///and maps the values from the passed in XSC + ///Requirement to its members. + static void handle_requirement (const Requirement& desc, + Deployment::Requirement& toconfig); + static Requirement + get_requirement (const Deployment::Requirement& src); + }; -typedef Sequence_Handler < Requirement, -::Deployment::Requirements, -::Deployment::Requirement, -Req_Handler::get_requirement > Requirement_Functor; + typedef Sequence_Handler < Requirement, + ::Deployment::Requirements, + ::Deployment::Requirement, + Req_Handler::handle_requirement > Requirement_Functor; -} + } } #include /**/ "ace/post.h" diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp index 0a50d889b0b..31f4d937a49 100644 --- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp @@ -20,7 +20,7 @@ namespace CIAO } void - SatisfierProperty_Handler::get_sat_property ( + SatisfierProperty_Handler::handle_sat_property ( const SatisfierProperty& desc, Deployment::SatisfierProperty& toconfig) { diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h index 2c2f671cb02..55bf12af241 100644 --- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h @@ -1,11 +1,11 @@ //================================================ /** -* @file SatisfierProperty_Handler.h -* -* $Id$ -* -* @author Jules White <jules@dre.vanderbilt.edu> -*/ + * @file SatisfierProperty_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ //================================================ #ifndef CIAO_CONFIG_HANDLERS_SATIS_PROPERTY_HANDLER_H @@ -22,49 +22,47 @@ namespace Deployment { -struct SatisfierProperty; -class SatisfierProperties; + struct SatisfierProperty; + class SatisfierProperties; } namespace CIAO { -namespace Config_Handlers -{ -class SatisfierProperty; - -/* -* @class SatisfierProperty_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 SatisfierProperty; -class Config_Handlers_Export SatisfierProperty_Handler -{ -public: -SatisfierProperty_Handler (void); -virtual ~SatisfierProperty_Handler (void); + /* + * @class SatisfierProperty_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. + * + */ -typedef Sequence_Iterator< const ::Deployment::SatisfierProperties, const ::Deployment::SatisfierProperty > sat_prop_iter; + class Config_Handlers_Export SatisfierProperty_Handler + { + public: + SatisfierProperty_Handler (void); + virtual ~SatisfierProperty_Handler (void); -/// This method maps the values from the XSC object -/// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type -/// <Deployment::SatisfierProperty>. -static void get_sat_property (const SatisfierProperty& desc, -::Deployment::SatisfierProperty& toconfig); -static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src); -}; + /// This method maps the values from the XSC object + /// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type + /// <Deployment::SatisfierProperty>. + static void handle_sat_property (const SatisfierProperty& desc, + ::Deployment::SatisfierProperty& toconfig); + static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src); + }; -typedef Sequence_Handler < SatisfierProperty, -::Deployment::SatisfierProperties, -::Deployment::SatisfierProperty, -SatisfierProperty_Handler::get_sat_property> SatisfierProperty_Functor; + typedef Sequence_Handler < SatisfierProperty, + ::Deployment::SatisfierProperties, + ::Deployment::SatisfierProperty, + SatisfierProperty_Handler::handle_sat_property> SatisfierProperty_Functor; -} + } } #include /**/ "ace/post.h" diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h b/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h index 34702cd60d0..19f6a5c9ea4 100644 --- a/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h +++ b/TAO/CIAO/tools/Config_Handlers/Utils/Functors.h @@ -17,80 +17,10 @@ namespace CIAO { namespace Config_Handlers { - template <typename Seq_Type, typename T> - class Sequence_Iterator : - public std::iterator <std::forward_iterator_tag, //iterator type - T, // Type pointed to by the iterator - CORBA::ULong> // Distance type - { - public: - Sequence_Iterator (void) - : pos_ (0), - seq_ (0) - { - } - - Sequence_Iterator (const Seq_Type &seq, CORBA::ULong pos = 0) - : pos_ (pos), - seq_ (&seq) - { - } - - Sequence_Iterator (const Sequence_Iterator &s) - { - *this = s; - } - - Sequence_Iterator& operator= (const Sequence_Iterator &s) - { - this->seq_ = s.seq_; - this->pos_ = s.pos_; - return *this; - } - - bool operator== (Sequence_Iterator &s) - { - return (this->seq_ == s.seq_) && (this->pos_ == s.pos_); - } - - bool operator!= (Sequence_Iterator &s) - { - return !(*this == s); - } - - T& operator* (void) - { - return (*seq_)[pos_]; - } - - T& operator-> (void) - { - return *(*this); - } - - // Prefix operator - Sequence_Iterator& operator++ () - { - ++pos_; - return *this; - } - - Sequence_Iterator& operator++ (int) - { - Sequence_Iterator ans (*this); - ++(*this); - return ans; - } - - private: - CORBA::ULong pos_; - Seq_Type *seq_; - }; - template <typename Source, typename Dest, typename Dest_Type, - void (*Func)(const Source &, Dest_Type &)> + void (&Func)(const Source &, Dest_Type &)> struct Sequence_Handler { Sequence_Handler (Dest &dest, CORBA::ULong pos = 0) @@ -109,6 +39,22 @@ namespace CIAO CORBA::ULong pos_; }; + /* + * This is a workaround for a GCC bug that for some reason causes + * functions that appear ONLY in a Sequence_Handler typedef to not + * be present in the compiled object file. + * This bug was first observed in GCC 4.02. + * + * W: The function we want to be defined + * X: First argument to the function + * Y: Second argument to the function + */ +#define SEQ_HAND_GCC_BUG_WORKAROUND(W, X, Y) \ + while(0) { \ + W (*X, Y[0]); \ + } + + template <typename Dest, typename Dest_Type> struct String_Seq_Handler { diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp index 93c2a003606..a23d7f2cdd9 100644 --- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp +++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp @@ -29,19 +29,9 @@ namespace XMLSchema typedef XSCRT::FundamentalType<ACE_INT32> int_; typedef XSCRT::FundamentalType<ACE_UINT32> unsignedInt; - //@@ VC6 -#if defined (_MSC_VER) && (_MSC_VER < 1300) - - typedef XSCRT::FundamentalType<__int64> long_; - typedef XSCRT::FundamentalType<unsigned __int64> unsignedLong; - -#else - typedef XSCRT::FundamentalType<ACE_INT64> long_; typedef XSCRT::FundamentalType<ACE_UINT64> unsignedLong; -#endif - //@@ It would be nice to use some arbitrary-length integer class. // typedef long_ decimal; diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp index 041b369884a..d7d55058b25 100644 --- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp +++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp @@ -1,11 +1,5 @@ // $Id$ -#if defined (_MSC_VER) && (_MSC_VER < 1300) -#pragma warning (disable: 4018) -#pragma warning (disable: 4284) -#pragma warning (disable: 4146) -#endif - #include "XML_File_Intf.h" #include "Utils/XML_Helper.h" #include "Deployment.hpp" diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp index 0d84a6bc28a..26dfbc8e695 100644 --- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp +++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp @@ -12,87 +12,6 @@ #include "XSCRT/Parser.hpp" -#if defined (_MSC_VER) && (_MSC_VER < 1300) - - -// Stuff for broken VC6. Don't like what you see - use better compiler! -// - - -inline -std::wistream& -operator>> (std::wistream& is, __int64& v) -{ - long t; - is >> t; - v = t; - return is; -} - -inline -std::wistream& -operator>> (std::wistream& is, unsigned __int64& v) -{ - unsigned long t; - is >> t; - v = t; - return is; -} - -inline -std::wostream& -operator<< (std::wostream& os, __int64 const& v) -{ - os << long (v); - return os; -} - -inline -std::wostream& -operator<< (std::wostream& os, unsigned __int64 const& v) -{ - os << unsigned long (v); - return os; -} - -inline -std::istream& -operator>> (std::istream& is, __int64& v) -{ - long t; - is >> t; - v = t; - return is; -} - -inline -std::istream& -operator>> (std::istream& is, unsigned __int64& v) -{ - unsigned long t; - is >> t; - v = t; - return is; -} - -inline -std::ostream& -operator<< (std::ostream& os, __int64 const& v) -{ - os << long (v); - return os; -} - -inline -std::ostream& -operator<< (std::ostream& os, unsigned __int64 const& v) -{ - os << unsigned long (v); - return os; -} - -#endif - namespace XSCRT { struct IdentityProvider diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp index b12fda738d2..1f11533e2bb 100644 --- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp +++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp @@ -11,16 +11,6 @@ #include <xercesc/dom/DOM.hpp> #include <xercesc/util/XMLString.hpp> - -//@@ VC6 -#if defined (_MSC_VER) && (_MSC_VER < 1300) - -namespace std -{ - typedef ::size_t size_t; -} -#endif - namespace XSCRT { namespace XML diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp index 31bad0bc207..6f810782953 100644 --- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp +++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp @@ -21,19 +21,9 @@ namespace XMLSchema typedef XSCRT::FundamentalType<int> int_; typedef XSCRT::FundamentalType<unsigned int> unsignedInt; - //@@ VC6 -#if defined (_MSC_VER) && (_MSC_VER < 1300) - - typedef XSCRT::FundamentalType<__int64> long_; - typedef XSCRT::FundamentalType<unsigned __int64> unsignedLong; - -#else - typedef XSCRT::FundamentalType<long long> long_; typedef XSCRT::FundamentalType<unsigned long long> unsignedLong; -#endif - //@@ It would be nice to use some arbitrary-length integer class. // typedef long_ decimal; diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp index 8c8cb56e04f..f6033db9fca 100644 --- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp +++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp @@ -1,13 +1,13 @@ /* $Id$ -* This code was generated by the XML Schema Compiler. -* -* Changes made to this code will most likely be overwritten -* when the handlers are recompiled. -* -* If you find errors or feel that there are bugfixes to be made, -* please contact the current XSC maintainer: -* Will Otte <wotte@dre.vanderbilt.edu> -*/ + * This code was generated by the XML Schema Compiler. + * + * Changes made to this code will most likely be overwritten + * when the handlers are recompiled. + * + * If you find errors or feel that there are bugfixes to be made, + * please contact the current XSC maintainer: + * Will Otte <wotte@dre.vanderbilt.edu> + */ // Fix for Borland compilers, which seem to have a broken @@ -25,10 +25,10 @@ // namespace CIAO { -namespace Config_Handlers -{ -class DeploymentPlan; -} + namespace Config_Handlers + { + class DeploymentPlan; + } } #include <memory> @@ -39,665 +39,665 @@ class DeploymentPlan; namespace CIAO { -namespace Config_Handlers -{ -class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type -{ -//@@ VC6 anathema -typedef ::XSCRT::Type Base__; - -// label -// -public: -bool label_p () const; -::XMLSchema::string< ACE_TCHAR > const& label () const; -void label (::XMLSchema::string< ACE_TCHAR > const& ); - -protected: -::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_; - -// UUID -// -public: -bool UUID_p () const; -::XMLSchema::string< ACE_TCHAR > const& UUID () const; -void UUID (::XMLSchema::string< ACE_TCHAR > const& ); - -protected: -::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_; - -// realizes -// -public: -bool realizes_p () const; -::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const; -void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& ); - -protected: -::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_; - -// implementation -// -public: -typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator; -typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator; -implementation_iterator begin_implementation (); -implementation_iterator end_implementation (); -implementation_const_iterator begin_implementation () const; -implementation_const_iterator end_implementation () const; -void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& ); -size_t count_implementation (void) const; - -protected: -::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_; - -// instance -// -public: -typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator; -typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator; -instance_iterator begin_instance (); -instance_iterator end_instance (); -instance_const_iterator begin_instance () const; -instance_const_iterator end_instance () const; -void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& ); -size_t count_instance (void) const; - -protected: -::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_; - -// connection -// -public: -typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator; -typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator; -connection_iterator begin_connection (); -connection_iterator end_connection (); -connection_const_iterator begin_connection () const; -connection_const_iterator end_connection () const; -void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& ); -size_t count_connection (void) const; - -protected: -::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_; - -// dependsOn -// -public: -typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator; -typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator; -dependsOn_iterator begin_dependsOn (); -dependsOn_iterator end_dependsOn (); -dependsOn_const_iterator begin_dependsOn () const; -dependsOn_const_iterator end_dependsOn () const; -void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& ); -size_t count_dependsOn (void) const; - -protected: -::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_; - -// artifact -// -public: -typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator; -typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator; -artifact_iterator begin_artifact (); -artifact_iterator end_artifact (); -artifact_const_iterator begin_artifact () const; -artifact_const_iterator end_artifact () const; -void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& ); -size_t count_artifact (void) const; - -protected: -::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_; - -// infoProperty -// -public: -typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator; -typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator; -infoProperty_iterator begin_infoProperty (); -infoProperty_iterator end_infoProperty (); -infoProperty_const_iterator begin_infoProperty () const; -infoProperty_const_iterator end_infoProperty () const; -void add_infoProperty (::CIAO::Config_Handlers::Property const& ); -size_t count_infoProperty (void) const; - -protected: -::std::list< ::CIAO::Config_Handlers::Property > infoProperty_; - -public: -DeploymentPlan (); - -DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&); -DeploymentPlan (DeploymentPlan const& s); - -DeploymentPlan& -operator= (DeploymentPlan const& s); - -private: -char regulator__; -}; -} + namespace Config_Handlers + { + class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type + { + //@@ VC6 anathema + typedef ::XSCRT::Type Base__; + + // label + // + public: + bool label_p () const; + ::XMLSchema::string< ACE_TCHAR > const& label () const; + void label (::XMLSchema::string< ACE_TCHAR > const& ); + + protected: + ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_; + + // UUID + // + public: + bool UUID_p () const; + ::XMLSchema::string< ACE_TCHAR > const& UUID () const; + void UUID (::XMLSchema::string< ACE_TCHAR > const& ); + + protected: + ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_; + + // realizes + // + public: + bool realizes_p () const; + ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const; + void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& ); + + protected: + ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_; + + // implementation + // + public: + typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator; + typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator; + implementation_iterator begin_implementation (); + implementation_iterator end_implementation (); + implementation_const_iterator begin_implementation () const; + implementation_const_iterator end_implementation () const; + void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& ); + size_t count_implementation (void) const; + + protected: + ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_; + + // instance + // + public: + typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator; + typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator; + instance_iterator begin_instance (); + instance_iterator end_instance (); + instance_const_iterator begin_instance () const; + instance_const_iterator end_instance () const; + void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& ); + size_t count_instance (void) const; + + protected: + ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_; + + // connection + // + public: + typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator; + typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator; + connection_iterator begin_connection (); + connection_iterator end_connection (); + connection_const_iterator begin_connection () const; + connection_const_iterator end_connection () const; + void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& ); + size_t count_connection (void) const; + + protected: + ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_; + + // dependsOn + // + public: + typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator; + typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator; + dependsOn_iterator begin_dependsOn (); + dependsOn_iterator end_dependsOn (); + dependsOn_const_iterator begin_dependsOn () const; + dependsOn_const_iterator end_dependsOn () const; + void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& ); + size_t count_dependsOn (void) const; + + protected: + ::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_; + + // artifact + // + public: + typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator; + typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator; + artifact_iterator begin_artifact (); + artifact_iterator end_artifact (); + artifact_const_iterator begin_artifact () const; + artifact_const_iterator end_artifact () const; + void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& ); + size_t count_artifact (void) const; + + protected: + ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_; + + // infoProperty + // + public: + typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator; + typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator; + infoProperty_iterator begin_infoProperty (); + infoProperty_iterator end_infoProperty (); + infoProperty_const_iterator begin_infoProperty () const; + infoProperty_const_iterator end_infoProperty () const; + void add_infoProperty (::CIAO::Config_Handlers::Property const& ); + size_t count_infoProperty (void) const; + + protected: + ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_; + + public: + DeploymentPlan (); + + DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&); + DeploymentPlan (DeploymentPlan const& s); + + DeploymentPlan& + operator= (DeploymentPlan const& s); + + private: + char regulator__; + }; + } } namespace CIAO { -namespace Config_Handlers -{ -} + namespace Config_Handlers + { + } } #include "XMLSchema/Traversal.hpp" namespace CIAO { -namespace Config_Handlers -{ -namespace Traversal -{ -struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan > -{ -virtual void -traverse (Type&); + namespace Config_Handlers + { + namespace Traversal + { + struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan > + { + virtual void + traverse (Type&); -virtual void -traverse (Type const&); + virtual void + traverse (Type const&); -virtual void -pre (Type&); + virtual void + pre (Type&); -virtual void -pre (Type const&); + virtual void + pre (Type const&); -virtual void -label (Type&); + virtual void + label (Type&); -virtual void -label (Type const&); + virtual void + label (Type const&); -virtual void -label_none (Type&); + virtual void + label_none (Type&); -virtual void -label_none (Type const&); + virtual void + label_none (Type const&); -virtual void -UUID (Type&); + virtual void + UUID (Type&); -virtual void -UUID (Type const&); + virtual void + UUID (Type const&); -virtual void -UUID_none (Type&); + virtual void + UUID_none (Type&); -virtual void -UUID_none (Type const&); + virtual void + UUID_none (Type const&); -virtual void -realizes (Type&); + virtual void + realizes (Type&); -virtual void -realizes (Type const&); + virtual void + realizes (Type const&); -virtual void -realizes_none (Type&); + virtual void + realizes_none (Type&); -virtual void -realizes_none (Type const&); + virtual void + realizes_none (Type const&); -virtual void -implementation (Type&); + virtual void + implementation (Type&); -virtual void -implementation (Type const&); + virtual void + implementation (Type const&); -virtual void -implementation_pre (Type&); + virtual void + implementation_pre (Type&); -virtual void -implementation_pre (Type const&); + virtual void + implementation_pre (Type const&); -virtual void -implementation_next (Type&); + virtual void + implementation_next (Type&); -virtual void -implementation_next (Type const&); + virtual void + implementation_next (Type const&); -virtual void -implementation_post (Type&); + virtual void + implementation_post (Type&); -virtual void -implementation_post (Type const&); + virtual void + implementation_post (Type const&); -virtual void -instance (Type&); + virtual void + instance (Type&); -virtual void -instance (Type const&); + virtual void + instance (Type const&); -virtual void -instance_pre (Type&); + virtual void + instance_pre (Type&); -virtual void -instance_pre (Type const&); + virtual void + instance_pre (Type const&); -virtual void -instance_next (Type&); + virtual void + instance_next (Type&); -virtual void -instance_next (Type const&); + virtual void + instance_next (Type const&); -virtual void -instance_post (Type&); + virtual void + instance_post (Type&); -virtual void -instance_post (Type const&); + virtual void + instance_post (Type const&); -virtual void -instance_none (Type&); + virtual void + instance_none (Type&); -virtual void -instance_none (Type const&); + virtual void + instance_none (Type const&); -virtual void -connection (Type&); + virtual void + connection (Type&); -virtual void -connection (Type const&); + virtual void + connection (Type const&); -virtual void -connection_pre (Type&); + virtual void + connection_pre (Type&); -virtual void -connection_pre (Type const&); + virtual void + connection_pre (Type const&); -virtual void -connection_next (Type&); + virtual void + connection_next (Type&); -virtual void -connection_next (Type const&); + virtual void + connection_next (Type const&); -virtual void -connection_post (Type&); + virtual void + connection_post (Type&); -virtual void -connection_post (Type const&); + virtual void + connection_post (Type const&); -virtual void -connection_none (Type&); + virtual void + connection_none (Type&); -virtual void -connection_none (Type const&); + virtual void + connection_none (Type const&); -virtual void -dependsOn (Type&); + virtual void + dependsOn (Type&); -virtual void -dependsOn (Type const&); + virtual void + dependsOn (Type const&); -virtual void -dependsOn_pre (Type&); + virtual void + dependsOn_pre (Type&); -virtual void -dependsOn_pre (Type const&); + virtual void + dependsOn_pre (Type const&); -virtual void -dependsOn_next (Type&); + virtual void + dependsOn_next (Type&); -virtual void -dependsOn_next (Type const&); + virtual void + dependsOn_next (Type const&); -virtual void -dependsOn_post (Type&); + virtual void + dependsOn_post (Type&); -virtual void -dependsOn_post (Type const&); + virtual void + dependsOn_post (Type const&); -virtual void -dependsOn_none (Type&); + virtual void + dependsOn_none (Type&); -virtual void -dependsOn_none (Type const&); + virtual void + dependsOn_none (Type const&); -virtual void -artifact (Type&); + virtual void + artifact (Type&); -virtual void -artifact (Type const&); + virtual void + artifact (Type const&); -virtual void -artifact_pre (Type&); + virtual void + artifact_pre (Type&); -virtual void -artifact_pre (Type const&); + virtual void + artifact_pre (Type const&); -virtual void -artifact_next (Type&); + virtual void + artifact_next (Type&); -virtual void -artifact_next (Type const&); + virtual void + artifact_next (Type const&); -virtual void -artifact_post (Type&); + virtual void + artifact_post (Type&); -virtual void -artifact_post (Type const&); + virtual void + artifact_post (Type const&); -virtual void -artifact_none (Type&); + virtual void + artifact_none (Type&); -virtual void -artifact_none (Type const&); + virtual void + artifact_none (Type const&); -virtual void -infoProperty (Type&); + virtual void + infoProperty (Type&); -virtual void -infoProperty (Type const&); + virtual void + infoProperty (Type const&); -virtual void -infoProperty_pre (Type&); + virtual void + infoProperty_pre (Type&); -virtual void -infoProperty_pre (Type const&); + virtual void + infoProperty_pre (Type const&); -virtual void -infoProperty_next (Type&); + virtual void + infoProperty_next (Type&); -virtual void -infoProperty_next (Type const&); + virtual void + infoProperty_next (Type const&); -virtual void -infoProperty_post (Type&); + virtual void + infoProperty_post (Type&); -virtual void -infoProperty_post (Type const&); + virtual void + infoProperty_post (Type const&); -virtual void -infoProperty_none (Type&); + virtual void + infoProperty_none (Type&); -virtual void -infoProperty_none (Type const&); + virtual void + infoProperty_none (Type const&); -virtual void -post (Type&); + virtual void + post (Type&); -virtual void -post (Type const&); -}; -} -} + virtual void + post (Type const&); + }; + } + } } #include "XMLSchema/Writer.hpp" namespace CIAO { -namespace Config_Handlers -{ -namespace Writer -{ -struct DeploymentPlan : Traversal::DeploymentPlan, -virtual ::XSCRT::Writer< ACE_TCHAR > -{ -typedef ::CIAO::Config_Handlers::DeploymentPlan Type; -DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&); + namespace Config_Handlers + { + namespace Writer + { + struct DeploymentPlan : Traversal::DeploymentPlan, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + typedef ::CIAO::Config_Handlers::DeploymentPlan Type; + DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&); -virtual void -traverse (Type &o) -{ + virtual void + traverse (Type &o) + { -this->traverse (const_cast <Type const &> (o)); -} + this->traverse (const_cast <Type const &> (o)); + } -virtual void -traverse (Type const&); + virtual void + traverse (Type const&); -virtual void -label (Type &o) -{ + virtual void + label (Type &o) + { -this->label (const_cast <Type const &> (o)); -} + this->label (const_cast <Type const &> (o)); + } -virtual void -label (Type const&); + virtual void + label (Type const&); -virtual void -UUID (Type &o) -{ + virtual void + UUID (Type &o) + { -this->UUID (const_cast <Type const &> (o)); -} + this->UUID (const_cast <Type const &> (o)); + } -virtual void -UUID (Type const&); + virtual void + UUID (Type const&); -virtual void -realizes (Type &o) -{ + virtual void + realizes (Type &o) + { -this->realizes (const_cast <Type const &> (o)); -} + this->realizes (const_cast <Type const &> (o)); + } -virtual void -realizes (Type const&); + virtual void + realizes (Type const&); -virtual void -implementation_pre (Type &o) -{ + virtual void + implementation_pre (Type &o) + { -this->implementation_pre (const_cast <Type const &> (o)); -} + this->implementation_pre (const_cast <Type const &> (o)); + } -virtual void -implementation_pre (Type const&); + virtual void + implementation_pre (Type const&); -virtual void -implementation_next (Type &o) -{ + virtual void + implementation_next (Type &o) + { -this->implementation_next (const_cast <Type const &> (o)); -} + this->implementation_next (const_cast <Type const &> (o)); + } -virtual void -implementation_next (Type const&); + virtual void + implementation_next (Type const&); -virtual void -implementation_post (Type &o) -{ + virtual void + implementation_post (Type &o) + { -this->implementation_post (const_cast <Type const &> (o)); -} + this->implementation_post (const_cast <Type const &> (o)); + } -virtual void -implementation_post (Type const&); + virtual void + implementation_post (Type const&); -virtual void -instance_pre (Type &o) -{ + virtual void + instance_pre (Type &o) + { -this->instance_pre (const_cast <Type const &> (o)); -} + this->instance_pre (const_cast <Type const &> (o)); + } -virtual void -instance_pre (Type const&); + virtual void + instance_pre (Type const&); -virtual void -instance_next (Type &o) -{ + virtual void + instance_next (Type &o) + { -this->instance_next (const_cast <Type const &> (o)); -} + this->instance_next (const_cast <Type const &> (o)); + } -virtual void -instance_next (Type const&); + virtual void + instance_next (Type const&); -virtual void -instance_post (Type &o) -{ + virtual void + instance_post (Type &o) + { -this->instance_post (const_cast <Type const &> (o)); -} + this->instance_post (const_cast <Type const &> (o)); + } -virtual void -instance_post (Type const&); + virtual void + instance_post (Type const&); -virtual void -connection_pre (Type &o) -{ + virtual void + connection_pre (Type &o) + { -this->connection_pre (const_cast <Type const &> (o)); -} + this->connection_pre (const_cast <Type const &> (o)); + } -virtual void -connection_pre (Type const&); + virtual void + connection_pre (Type const&); -virtual void -connection_next (Type &o) -{ + virtual void + connection_next (Type &o) + { -this->connection_next (const_cast <Type const &> (o)); -} + this->connection_next (const_cast <Type const &> (o)); + } -virtual void -connection_next (Type const&); + virtual void + connection_next (Type const&); -virtual void -connection_post (Type &o) -{ + virtual void + connection_post (Type &o) + { -this->connection_post (const_cast <Type const &> (o)); -} + this->connection_post (const_cast <Type const &> (o)); + } -virtual void -connection_post (Type const&); + virtual void + connection_post (Type const&); -virtual void -dependsOn_pre (Type &o) -{ + virtual void + dependsOn_pre (Type &o) + { -this->dependsOn_pre (const_cast <Type const &> (o)); -} + this->dependsOn_pre (const_cast <Type const &> (o)); + } -virtual void -dependsOn_pre (Type const&); + virtual void + dependsOn_pre (Type const&); -virtual void -dependsOn_next (Type &o) -{ + virtual void + dependsOn_next (Type &o) + { -this->dependsOn_next (const_cast <Type const &> (o)); -} + this->dependsOn_next (const_cast <Type const &> (o)); + } -virtual void -dependsOn_next (Type const&); + virtual void + dependsOn_next (Type const&); -virtual void -dependsOn_post (Type &o) -{ + virtual void + dependsOn_post (Type &o) + { -this->dependsOn_post (const_cast <Type const &> (o)); -} + this->dependsOn_post (const_cast <Type const &> (o)); + } -virtual void -dependsOn_post (Type const&); + virtual void + dependsOn_post (Type const&); -virtual void -artifact_pre (Type &o) -{ + virtual void + artifact_pre (Type &o) + { -this->artifact_pre (const_cast <Type const &> (o)); -} + this->artifact_pre (const_cast <Type const &> (o)); + } -virtual void -artifact_pre (Type const&); + virtual void + artifact_pre (Type const&); -virtual void -artifact_next (Type &o) -{ + virtual void + artifact_next (Type &o) + { -this->artifact_next (const_cast <Type const &> (o)); -} + this->artifact_next (const_cast <Type const &> (o)); + } -virtual void -artifact_next (Type const&); + virtual void + artifact_next (Type const&); -virtual void -artifact_post (Type &o) -{ + virtual void + artifact_post (Type &o) + { -this->artifact_post (const_cast <Type const &> (o)); -} + this->artifact_post (const_cast <Type const &> (o)); + } -virtual void -artifact_post (Type const&); + virtual void + artifact_post (Type const&); -virtual void -infoProperty_pre (Type &o) -{ + virtual void + infoProperty_pre (Type &o) + { -this->infoProperty_pre (const_cast <Type const &> (o)); -} + this->infoProperty_pre (const_cast <Type const &> (o)); + } -virtual void -infoProperty_pre (Type const&); + virtual void + infoProperty_pre (Type const&); -virtual void -infoProperty_next (Type &o) -{ + virtual void + infoProperty_next (Type &o) + { -this->infoProperty_next (const_cast <Type const &> (o)); -} + this->infoProperty_next (const_cast <Type const &> (o)); + } -virtual void -infoProperty_next (Type const&); + virtual void + infoProperty_next (Type const&); -virtual void -infoProperty_post (Type &o) -{ + virtual void + infoProperty_post (Type &o) + { -this->infoProperty_post (const_cast <Type const &> (o)); -} + this->infoProperty_post (const_cast <Type const &> (o)); + } -virtual void -infoProperty_post (Type const&); + virtual void + infoProperty_post (Type const&); -protected: -DeploymentPlan (); -}; -} -} + protected: + DeploymentPlan (); + }; + } + } } namespace CIAO { -namespace Config_Handlers -{ -} + namespace Config_Handlers + { + } } #endif // CDP_HPP diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp index d828adf7ece..09964cff90b 100644 --- a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp +++ b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp @@ -1,13 +1,13 @@ /* $Id$ -* This code was generated by the XML Schema Compiler. -* -* Changes made to this code will most likely be overwritten -* when the handlers are recompiled. -* -* If you find errors or feel that there are bugfixes to be made, -* please contact the current XSC maintainer: -* Will Otte <wotte@dre.vanderbilt.edu> -*/ + * This code was generated by the XML Schema Compiler. + * + * Changes made to this code will most likely be overwritten + * when the handlers are recompiled. + * + * If you find errors or feel that there are bugfixes to be made, + * please contact the current XSC maintainer: + * Will Otte <wotte@dre.vanderbilt.edu> + */ // Fix for Borland compilers, which seem to have a broken @@ -24,10 +24,10 @@ // namespace CIAO { -namespace Config_Handlers -{ -class TopLevelPackageDescription; -} + namespace Config_Handlers + { + class TopLevelPackageDescription; + } } #include <memory> @@ -38,130 +38,131 @@ class TopLevelPackageDescription; namespace CIAO { -namespace Config_Handlers -{ -class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type -{ -//@@ VC6 anathema -typedef ::XSCRT::Type Base__; + namespace Config_Handlers + { + class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type + { + //@@ VC6 anathema + typedef ::XSCRT::Type Base__; -// package -// -public: -::CIAO::Config_Handlers::PackageConfiguration const& package () const; -void package (::CIAO::Config_Handlers::PackageConfiguration const& ); - -protected: -::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_; + // package + // + public: + ::CIAO::Config_Handlers::PackageConfiguration const& package () const; + void package (::CIAO::Config_Handlers::PackageConfiguration const& ); -public: -TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__); + protected: + ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_; -TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&); -TopLevelPackageDescription (TopLevelPackageDescription const& s); + public: + TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__); -TopLevelPackageDescription& -operator= (TopLevelPackageDescription const& s); + TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&); + TopLevelPackageDescription (TopLevelPackageDescription const& s); + + ~TopLevelPackageDescription () {}; + TopLevelPackageDescription& + operator= (TopLevelPackageDescription const& s); -private: -char regulator__; -}; -} + private: + char regulator__; + }; + } } namespace CIAO { -namespace Config_Handlers -{ -} + namespace Config_Handlers + { + } } #include "XMLSchema/Traversal.hpp" namespace CIAO { -namespace Config_Handlers -{ -namespace Traversal -{ -struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription > -{ -virtual void -traverse (Type&); + namespace Config_Handlers + { + namespace Traversal + { + struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription > + { + virtual void + traverse (Type&); -virtual void -traverse (Type const&); + virtual void + traverse (Type const&); -virtual void -pre (Type&); + virtual void + pre (Type&); -virtual void -pre (Type const&); + virtual void + pre (Type const&); -virtual void -package (Type&); + virtual void + package (Type&); -virtual void -package (Type const&); + virtual void + package (Type const&); -virtual void -post (Type&); + virtual void + post (Type&); -virtual void -post (Type const&); -}; -} -} + virtual void + post (Type const&); + }; + } + } } #include "XMLSchema/Writer.hpp" namespace CIAO { -namespace Config_Handlers -{ -namespace Writer -{ -struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription, -virtual ::XSCRT::Writer< ACE_TCHAR > -{ -typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type; -TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&); + namespace Config_Handlers + { + namespace Writer + { + struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type; + TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&); -virtual void -traverse (Type &o) -{ + virtual void + traverse (Type &o) + { -this->traverse (const_cast <Type const &> (o)); -} + this->traverse (const_cast <Type const &> (o)); + } -virtual void -traverse (Type const&); + virtual void + traverse (Type const&); -virtual void -package (Type &o) -{ + virtual void + package (Type &o) + { -this->package (const_cast <Type const &> (o)); -} + this->package (const_cast <Type const &> (o)); + } -virtual void -package (Type const&); + virtual void + package (Type const&); -protected: -TopLevelPackageDescription (); -}; -} -} + protected: + TopLevelPackageDescription (); + }; + } + } } namespace CIAO { -namespace Config_Handlers -{ -} + namespace Config_Handlers + { + } } #endif // TOPLEVEL_HPP |