diff options
| author | wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-02-25 18:18:42 +0000 |
|---|---|---|
| committer | wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-02-25 18:18:42 +0000 |
| commit | 26ba73760fc0e4f657f1ca10290203ea09e045b5 (patch) | |
| tree | 37ad39ea8f08459cb7720470294b477c192f1a8d | |
| parent | 56a3affde83c50addf4e1aae1ee3bb60e8cb1361 (diff) | |
| download | ATCD-26ba73760fc0e4f657f1ca10290203ea09e045b5.tar.gz | |
ChangeLogTag: Wed Feb 25 18:17:38 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 14 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/CIAO/FTComponents/FTComponents.mpc | 7 | ||||
| -rw-r--r-- | CIAO/ciao/Containers/FTSession/FT_Session_Container.cpp | 4 |
4 files changed, 25 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 6311456b78e..8b1e36002d3 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,17 @@ +Wed Feb 25 18:17:38 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu> + + * DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp: + + Removed RTCORBA code. + + * DAnCE/tests/CIAO/FTComponents/FTComponents.mpc: + + Changed library includes. + + * ciao/Containers/FTSession/FT_Session_Container.cpp: + + Fixed debugging output. + Wed Feb 25 03:41:17 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu> * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: diff --git a/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp b/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp index 994f1011806..60d9016d0d4 100644 --- a/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp +++ b/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp @@ -1,7 +1,7 @@ // $Id$ #include <ace/High_Res_Timer.h> -#include <tao/RTCORBA/RTCORBA.h> +//#include <tao/RTCORBA/RTCORBA.h> #include "FTClient_Timer_Handler.h" #include "ciao/CIAO_common.h" #include "WorkerC.h" @@ -28,10 +28,12 @@ namespace CIDL_FTClient_Impl { DeCoRAM::Worker_var server = client_executor_->server (); + /* CORBA::Object_var obj = orb_->resolve_initial_references ("RTCurrent"); RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (obj); - // rt_current->the_priority (client_executor_->priority ()); + rt_current->the_priority (client_executor_->priority ()); + */ try { diff --git a/CIAO/DAnCE/tests/CIAO/FTComponents/FTComponents.mpc b/CIAO/DAnCE/tests/CIAO/FTComponents/FTComponents.mpc index 9b2e21273dc..42af9cd517a 100644 --- a/CIAO/DAnCE/tests/CIAO/FTComponents/FTComponents.mpc +++ b/CIAO/DAnCE/tests/CIAO/FTComponents/FTComponents.mpc @@ -6,6 +6,10 @@ project(Worker) : ciaoidldefaults, anytypecode, ciao_lib, portableserver { -Wb,skel_export_macro=FTWORKER_Export \ -Wb,skel_export_include=FTWorker_export.h + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } + macros += FTWORKER_BUILD_DLL IDL_Files { @@ -236,8 +240,7 @@ project(FTTask_svnt) : ciao_servant, naming, ciao_lib { after += FTTask_exec sharedname = FTTask_svnt libs += FTTask_exec \ - FTTask_stub \ - Worker + FTTask_stub includes += $(TAO_ROOT)/orbsvcs/orbsvcs/LWFT dynamicflags = FTTASK_SVNT_BUILD_DLL diff --git a/CIAO/ciao/Containers/FTSession/FT_Session_Container.cpp b/CIAO/ciao/Containers/FTSession/FT_Session_Container.cpp index f6eed249e59..15b44161656 100644 --- a/CIAO/ciao/Containers/FTSession/FT_Session_Container.cpp +++ b/CIAO/ciao/Containers/FTSession/FT_Session_Container.cpp @@ -233,7 +233,7 @@ namespace CIAO CORBA::String_var name = PortableServer::ObjectId_to_string (oid); CIAO_DEBUG ((LM_DEBUG, CLINFO - "FT_Session_Container::install_servant_with_id (%C)", + "FT_Session_Container::install_servant_with_id (%C)\n", name.in ())); tmp->activate_object_with_id (oid, @@ -537,7 +537,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "FT_Session_Container::install_component - " - "ERROR in opening the executor DLL [%C] \n", + "ERROR in opening the executor DLL [%C] - code \n", primary_artifact)); throw Components::Deployment::UnknownImplId (); |