diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp index 7ae2676c1c2..34cfcdf67bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp @@ -56,7 +56,7 @@ TAO_Notify_MT_Worker_Task::init_task ( } void -TAO_Notify_MT_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_MT_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // Put a shutdown message in the task queue and wait here till all // threads exit. @@ -71,8 +71,8 @@ TAO_Notify_MT_Worker_Task::close (u_long) TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command (); - TAO_ENV_DECLARE_NEW_ENV; - this->process_event (mb TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + this->process_event (mb ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We can not wait for ourselves to quit @@ -90,10 +90,10 @@ TAO_Notify_MT_Worker_Task::close (u_long) } int -TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv) +TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv) { // Execute the buffering strategy. - this->buffering_strategy_->execute (this->msg_queue (), mb TAO_ENV_ARG_PARAMETER, tv); + this->buffering_strategy_->execute (this->msg_queue (), mb ACE_ENV_ARG_PARAMETER, tv); ACE_CHECK_RETURN (-1); return 0; @@ -114,7 +114,7 @@ TAO_Notify_MT_Worker_Task::update_qos (TAO_Notify_QoSAdmin_i& qos_admin) // set on say the event channel or the supplier proxy. ACE_TRY_NEW_ENV { - CosNotification::QoSProperties_var qos = qos_admin.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + CosNotification::QoSProperties_var qos = qos_admin.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong index = 0; index < qos->length (); ++index) @@ -185,7 +185,7 @@ TAO_Notify_MT_Worker_Task::svc (void) if (command != 0) { - result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -212,7 +212,7 @@ TAO_Notify_Shutdown_Command::TAO_Notify_Shutdown_Command (void) } int -TAO_Notify_Shutdown_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Shutdown_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { return -1; } |