diff options
| author | lut <lut@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-09 01:55:45 +0000 |
|---|---|---|
| committer | lut <lut@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-09 01:55:45 +0000 |
| commit | 36cbd5c994358e273531cfa160fc1b768f2b0b8d (patch) | |
| tree | 565f0bc5e5478e96970d7bf579112cd59c1b3728 /TAO | |
| parent | 59c08a0535d05d5c093e7633de8556e8e948748d (diff) | |
| download | ATCD-36cbd5c994358e273531cfa160fc1b768f2b0b8d.tar.gz | |
ChangeLogTag: Tue Jun 8 20:53:12 2004 Tao Lu <lu@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
4 files changed, 16 insertions, 3 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index ee5bc2e0c42..8491a5b148c 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Tue Jun 8 20:53:12 2004 Tao Lu <lu@dre.vanderbilt.edu> + + * DnC/NodeApplicationManager/ImplementationInfo.cpp: + * DnC/NodeApplicationManager/ImplementationInfo.h: + Added these files. + + * DnC/NodeApplicationManager/NodeApplicationManager.mpc: + Changed MPC file reflect the changes. + + Seems MPC doesn't support template very well for GCC. The + dependency is not set at all. I have no choice but to switch to + normal operator overlaoding. + Tue Jun 8 19:54:03 2004 Tao Lu <lu@dre.vanderbilt.edu> * DnC/ciao/CCM_Core.mpc: diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc index 33e44e62dbd..6e3469a8467 100644 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc +++ b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc @@ -9,5 +9,6 @@ project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, ciao_dep Source_Files { NodeApplicationManager_Impl.cpp + ImplementationInfo.cpp } } diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp index 19bb7637a7f..5996d3be497 100644 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -176,7 +176,6 @@ create_node_application (const ACE_CString & options { //ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); - //@@ No Duplication here! so becareful. this->nodeapp_ = Deployment::NodeApplication::_duplicate (retval.in ()); } } @@ -273,7 +272,7 @@ startLaunch (const Deployment::Properties & configProperty, Deployment::ImplementationInfos infos; - if (!(infos << this->plan_)) + if (!(infos << (this->plan_))) { ACE_DEBUG ((LM_DEBUG, "Failed to create Component Implementation Infos!\n")); ACE_THROW_RETURN (Deployment::StartError (), 0); diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h index 770e210b82d..57695c45f88 100644 --- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -26,7 +26,7 @@ #include "ciao/DeploymentS.h" #include "CIAO_NAM_Export.h" #include "ciao/NodeApp_CB_Impl.h" -#include "ciao/ImplementationInfo.h" +#include "ImplementationInfo.h" namespace CIAO { |