diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 19:02:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 19:02:18 +0000 |
| commit | df2e15ebffab31a7931ce7a3dcccfbe0e8380d6f (patch) | |
| tree | 5426726ca9609fca29134b57aa4f81850d4cc0e4 | |
| parent | 73c9a911eb548d07df9eb09553e142185a39d2d8 (diff) | |
| download | ATCD-df2e15ebffab31a7931ce7a3dcccfbe0e8380d6f.tar.gz | |
ChangeLogTag: Wed Apr 19 18:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
3 files changed, 4 insertions, 4 deletions
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index ed11a2c4076..9c13da71a39 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -1009,7 +1009,7 @@ handle_es_consumer_connection ( for (CORBA::ULong j = 0; j < size; ++j) { - consumer_config->insert_source ((*filter).sources[j].in ()); + consumer_config->insert_source ((*filter).sources[j]); } } diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index baedfa7d7ea..aa60a7bfded 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -263,7 +263,7 @@ namespace CIAO // Copy the servant dll/so name. // @@ Note: I ignore all the other locations except the first one. impl_infos[i].servant_dll = - CORBA::string_dup (arti.location[0].in ()); + CORBA::string_dup (arti.location[0]); // Get the entry point. const CORBA::ULong prop_length = arti.execParameter.length (); @@ -306,7 +306,7 @@ namespace CIAO // @@ Note: I ignore all the other locations except the first one. exec_found = true; impl_infos[i].executor_dll = - CORBA::string_dup (arti.location[0].in ()); + CORBA::string_dup (arti.location[0]); // Get the entry point. const CORBA::ULong prop_length = arti.execParameter.length (); diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index dda6b43d890..04118376c5d 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -241,7 +241,7 @@ startLaunch (const Deployment::Properties & configProperty, ++arg_i) { cmd_option += " "; // space between command line args - cmd_option += (*server_resource).args[arg_i].in (); + cmd_option += (*server_resource).args[arg_i]; } // If service configuration file is specified through RTCCM |