diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-02 20:14:58 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-02 20:14:58 +0000 |
| commit | 928da544f6c784e1375c7f2f49f59bd4b0c4cb66 (patch) | |
| tree | 3fe88f32048bfbfd365842994418aed6b0cc4daf | |
| parent | ace1593600c2d672b3d508a5bdb33795ab2ed2f0 (diff) | |
| download | ATCD-928da544f6c784e1375c7f2f49f59bd4b0c4cb66.tar.gz | |
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Effectors/Base/Effector_Base.mpc | 2 | ||||
| -rw-r--r-- | Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp | 10 | ||||
| -rw-r--r-- | Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc | 2 |
4 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 1185276549e..69b3d36347e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Jul 2 20:14:08 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * Effectors/Base/Effector_Base.mpc: + + * Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp: + * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc: + + Compile fixes. + Mon Jun 15 17:51:23 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * Conductor/Conductor.mpc: @@ -9,8 +18,8 @@ Mon Jun 15 17:51:23 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * SA_POP/Tester/Tester_Component.mpc: * TM_Proxy/TM_Proxy.mpc: - Linking fixes. - + Linking fixes. + Thu Jun 11 20:02:58 UTC 2009 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> * common/RACE_common.mpc: diff --git a/Effectors/Base/Effector_Base.mpc b/Effectors/Base/Effector_Base.mpc index 79401e45d68..f23482934c9 100644 --- a/Effectors/Base/Effector_Base.mpc +++ b/Effectors/Base/Effector_Base.mpc @@ -40,7 +40,7 @@ project(Effector_Base_stub) : ccm_stub, race_common { } } -project(Effector_Base_svnt) : ciao_servant, race_common { +project(Effector_Base_svnt) : ciao_servant, race_common, dance_deployment_stub { avoids += ace_for_tao after += Effector_Base_stub sharedname = Effector_Base_svnt diff --git a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp index 56b94eb886f..b8aab8605b3 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp +++ b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp @@ -19,10 +19,10 @@ namespace CIAO DAnCE_OA_Component_Context *context, const char * repoman_id, Logger &logger) - : Plan_Launcher_Base_Impl (dynamic_cast<CIAO::Container_i *> - (this->context_->_ciao_the_Container ())->the_ORB (), - 0, - 0), + : DAnCE::Plan_Launcher::Plan_Launcher_Base_Impl (dynamic_cast<CIAO::Container_i *> + (this->context_->_ciao_the_Container ())->the_ORB (), + 0, + 0), context_ (context), repoman_id_ (CORBA::string_dup (repoman_id)), repoman_ (false), @@ -97,7 +97,7 @@ namespace CIAO } } - catch (Plan_Launcher_Base_Impl::Deployment_Failure &) + catch (DAnCE::Plan_Launcher::Plan_Launcher_Base_Impl::Deployment_Failure &) { std::string msg = "Exception caught::Unable to " "launch plan with UUID "; diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc index 9772acf2a0d..3c1ecbb3ced 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc +++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc @@ -73,7 +73,7 @@ project(DAnCE_Output_Adapter_exec) : ciao_executor, dance_plan_generator, ciao_c after += DAnCE_Output_Adapter_svnt RACE_utils sharedname = DAnCE_OA_Component_exec includes += $(RACE_ROOT)/utils - libs += Data_Base_Component_stub DAnCE_Utils TAO_RTCORBA DAnCE_ExecutionManager_stub + libs += Data_Base_Component_stub DAnCE_Utils TAO_RTCORBA DAnCE_ExecutionManager_stub CIAO_Context_Impl libs += OpString_stub \ RACE_common_stub \ DAnCE_OA_Component_stub \ |