diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-15 19:49:08 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-15 19:49:08 +0000 |
commit | f489e6d370fb6ee6fdb1e851c758bd0ca9dca956 (patch) | |
tree | 414bb67c5d39fbfd064e9e9359baa793f5f4875b | |
parent | b75e02b13a2325c8ce4bedb91685854823f81c41 (diff) | |
download | ATCD-f489e6d370fb6ee6fdb1e851c758bd0ca9dca956.tar.gz |
ChangeLogTag: Wed Dec 15 13:48:44 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | TAO/CIAO/ChangeLog | 22 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp | 6 |
2 files changed, 17 insertions, 11 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 7b0b3bcbe5c..e834357d662 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,26 +1,32 @@ +Wed Dec 15 13:48:44 2004 Chad Elliott <elliott_c@ociweb.com> + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + + Get rid of build warnings from gcc 3.3. + Tue Nov 30 21:41:58 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * CIDLC/ServantSourceGenerator.cpp (namespace): + * CIDLC/ServantSourceGenerator.cpp (namespace): - More use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. + More use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. Tue Nov 30 21:03:00 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * CIDLC/ServantSourceGenerator.cpp (namespace): + * CIDLC/ServantSourceGenerator.cpp (namespace): - Another use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. + Another use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. Tue Nov 30 20:39:26 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * CIDLC/ServantSourceGenerator.cpp (namespace): + * CIDLC/ServantSourceGenerator.cpp (namespace): - Used ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. + Used ACE_NEW_THROW_EX instead of ACE_NEW_RETURN. Tue Nov 30 20:22:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * CIDLC/ServantSourceGenerator.cpp (namespace): + * CIDLC/ServantSourceGenerator.cpp (namespace): - Fixes for VC6. + Fixes for VC6. Wed Nov 24 09:47:58 2004 Chad Elliott <elliott_c@ociweb.com> diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 7f07705f78a..a9591a62ee5 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -95,7 +95,7 @@ init (ACE_ENV_SINGLE_ARG_DECL) // corresponding child plan as input, which returns a // NodeApplicationManager object reference. Deployment::ApplicationManager_var tmp_app_manager = - my_node_manager->preparePlan (artifacts.child_plan_ + my_node_manager->preparePlan (artifacts.child_plan_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -394,7 +394,7 @@ startLaunch (const ::Deployment::Properties & configProperty, ACE_TRY_CHECK; // Cache the returned set of connections into the list. - this->add_connections (retn_connections); + this->add_connections (retn_connections.in ()); // Cache the returned NodeApplication object reference into // the hash table. @@ -443,7 +443,7 @@ finishLaunch (::CORBA::Boolean start // Get the Connections variable. Deployment::Connections * my_connections = - this->get_outgoing_connections ((entry->int_id_).child_plan_); + this->get_outgoing_connections ((entry->int_id_).child_plan_.in ()); if (my_connections == 0) ACE_THROW (Deployment::StartError ()); |