diff options
author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-06-18 17:48:39 +0000 |
---|---|---|
committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-06-18 17:48:39 +0000 |
commit | d4a1de76b241e08e70fbed9e2315cf36850fed49 (patch) | |
tree | a6335d432050694781c5141ba99a26398c69ae4d /CIAO | |
parent | d9e67fd2c355c620c844f82a59d834c1ffa23b5f (diff) | |
download | ATCD-d4a1de76b241e08e70fbed9e2315cf36850fed49.tar.gz |
Jun 18 17:47:10 UTC 2010 Martin Corino <mcorino@remedy.nl>
* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
Fixed incorrectly place #endif.
Diffstat (limited to 'CIAO')
-rw-r--r-- | CIAO/ChangeLog | 5 | ||||
-rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 84765a596f3..20daa3a9f2f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 18 17:47:10 UTC 2010 Martin Corino <mcorino@remedy.nl> + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + Fixed incorrectly place #endif. + Fri Jun 18 17:40:57 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/dds/DataReader_T.cpp: diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index fe57bbbec97..9d76f33dd6d 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -246,8 +246,9 @@ NodeApplicationManager_Impl::preparePlan (const Deployment::DeploymentPlan& plan DAnCE::Utility::update_property_value (DAnCE::DANCE_LM_LIBPATH, lm_mdd.execParameter, new_path.c_str ()); - } #endif + } + // Need to add naming service reference to config properties. DAnCE::Utility::update_property_value<CosNaming::NamingContext_ptr> ( DAnCE::LOCALITY_NAMINGCONTEXT, |