diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp')
| -rw-r--r-- | CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp index a3041db909c..8bf88e3e770 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp @@ -70,16 +70,16 @@ namespace CIAO toconfig.internalEndpoint.length (desc.count_internalEndpoint ()); SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe, - desc.begin_internalEndpoint (), - toconfig.internalEndpoint); + (*desc.begin_internalEndpoint ()), + toconfig.internalEndpoint); std::for_each (desc.begin_internalEndpoint (), desc.end_internalEndpoint (), SPE_Functor (toconfig.internalEndpoint)); toconfig.externalEndpoint.length (desc.count_externalEndpoint ()); std::for_each (desc.begin_externalEndpoint (), - desc.end_externalEndpoint (), - CEPE_Functor (toconfig.externalEndpoint)); + desc.end_externalEndpoint (), + CEPE_Functor (toconfig.externalEndpoint)); toconfig.externalReference.length (desc.count_externalReference ()); std::for_each (desc.begin_externalReference (), @@ -94,10 +94,9 @@ namespace CIAO CIAO_TRACE("ACD_Handler::get_acd - reverse"); AssemblyConnectionDescription retval (src.name.in ()); - +#if 0 for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) - retval.add_deployRequirement - (Req_Handler::get_requirement (src.deployRequirement[i])); + retval.add_deployRequirement (Req_Handler::get_requirement (src.deployRequirement[i])); for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i) retval.add_internalEndpoint @@ -110,7 +109,7 @@ namespace CIAO for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i) retval.add_externalReference (ERE_Handler::external_ref_endpoint (src.externalReference[i])); - +#endif return retval; } }; @@ -170,8 +169,8 @@ namespace CIAO toconfig.delegatesTo.length (desc.count_delegatesTo ()); SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr, - desc.begin_delegatesTo (), - toconfig.delegatesTo); + (*desc.begin_delegatesTo ()), + toconfig.delegatesTo); std::for_each (desc.begin_delegatesTo (), desc.end_delegatesTo (), SPR_Functor (toconfig.delegatesTo)); @@ -184,10 +183,10 @@ namespace CIAO AssemblyPropertyMapping retval (src.name.in (), src.externalName.in ()); - +#if 0 for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i) retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i])); - +#endif return retval; } }; @@ -211,29 +210,29 @@ 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); + 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); + 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)); } ComponentAssemblyDescription - CAD_Handler::component_assem_descr (const ::Deployment::ComponentAssemblyDescription &src) + CAD_Handler::component_assem_descr (const ::Deployment::ComponentAssemblyDescription &/*src*/) { CIAO_TRACE("CAD_Handler::component_assem_descr - reverse"); ComponentAssemblyDescription retval; - +#if 0 for (CORBA::ULong i = 0; i < src.instance.length (); ++i) retval.add_instance (SID_Handler::sub_comp_inst_descr (src.instance[i])); @@ -243,7 +242,7 @@ namespace CIAO for (CORBA::ULong i = 0; i < src.externalProperty.length (); ++i) retval.add_externalProperty (APM_Handler::get_apm (src.externalProperty[i])); - +#endif return retval; } |