diff options
Diffstat (limited to 'TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp')
| -rw-r--r-- | TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
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); |