diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/ADD_Handler.cpp')
| -rw-r--r-- | CIAO/tools/Config_Handlers/ADD_Handler.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/CIAO/tools/Config_Handlers/ADD_Handler.cpp index 1b898b603d2..6837481d500 100644 --- a/CIAO/tools/Config_Handlers/ADD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/ADD_Handler.cpp @@ -29,7 +29,7 @@ namespace CIAO aci_e != aci_b; ++aci_b) { - ADD_Handler::artifact_deployment_descr ((*aci_b), + ADD_Handler::artifact_deployment_descr (*(*aci_b), dest[pos], pos); pos++; @@ -58,7 +58,7 @@ namespace CIAO start != end; ++start) { - dest.location[len++] = start->c_str (); + dest.location[len++] = (*start)->c_str (); } ArtifactDeploymentDescription::source_const_iterator sce = @@ -70,7 +70,7 @@ namespace CIAO scb != sce; ++scb) { - dest.source[len++] = scb->c_str (); + dest.source[len++] = (*scb)->c_str (); } // @@TODO: See this loop is repeated @@ -83,13 +83,13 @@ namespace CIAO adcb != adce; ++adcb) { - Property_Handler::handle_property ((*adcb), - dest.execParameter[len++]); + Property_Handler::handle_property (*(*adcb), + dest.execParameter[len++]); } - if (src.xmi_id_p ()) + if (src.id_p ()) { - ACE_CString cstr (src.xmi_id ().c_str ()); + ACE_CString cstr (src.id ().c_str ()); ADD_Handler::IDREF.bind_ref (cstr,pos); } @@ -140,7 +140,7 @@ namespace CIAO for (size_t i = 0; i < total; ++i) { XMLSchema::string< char > curr ((src.location[i])); - add.add_location (curr); + //add.add_location (curr); } //As above, for the source(s) @@ -148,14 +148,14 @@ namespace CIAO for (size_t j = 0; j < total; ++j) { XMLSchema::string< char > curr ((src.source[j])); - add.add_source (curr); + //add.add_source (curr); } //As above for the execParameter(s) total = src.execParameter.length (); for (size_t k = 0; k < total; ++k) { - add.add_execParameter (Property_Handler::get_property (src.execParameter[k])); + //add.add_execParameter (Property_Handler::get_property (src.execParameter[k])); } // Generate a UUID to use for the IDREF. @@ -169,7 +169,7 @@ namespace CIAO // Bind the ref and set it in the IDD ADD_Handler::IDREF.bind_next_available (add_id); - add.xmi_id (xml_id); + add.id (xml_id); return add; } |