summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i52
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index fd86083a7f0..cc6c5d64243 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -19,7 +19,7 @@ ACE_ES_Dispatch_Request::~ACE_ES_Dispatch_Request (void)
ACE_INLINE
ACE_ES_Dispatch_Request::
-ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
+ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
RtecScheduler::handle_t rt_info)
: priority_ (0),
rt_info_ (rt_info),
@@ -48,8 +48,8 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
#if 0
ACE_INLINE
ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
- ACE_ES_Event_Container *event,
- RtecScheduler::handle_t rt_info) :
+ ACE_ES_Event_Container *event,
+ RtecScheduler::handle_t rt_info) :
priority_ (0),
rt_info_ (rt_info),
dispatching_module_ (0),
@@ -78,7 +78,7 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
RtecEventComm::Event tmp;
tmp.header.creation_time = time;
tmp.header.type = ACE_ES_EVENT_TIMEOUT;
- TAO_EC_Event_Set* set =
+ TAO_EC_Event_Set* set =
TAO_EC_Event_Set::_create (tmp);
this->single_event_ = TAO_EC_Event (set, set->length ());
@@ -87,8 +87,8 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
ACE_INLINE void
ACE_ES_Dispatch_Request::set (ACE_ES_Dispatching_Base *dispatching_module,
- RtecScheduler::OS_Priority preemption_priority,
- RtecScheduler::Preemption_Subpriority_t sub_priority)
+ RtecScheduler::OS_Priority preemption_priority,
+ RtecScheduler::Preemption_Subpriority_t sub_priority)
{
dispatching_module_ = dispatching_module;
priority_ = preemption_priority;
@@ -147,21 +147,21 @@ ACE_ES_Dispatching_Base::ACE_ES_Dispatching_Base (ACE_EventChannel *channel)
ACE_INLINE void
ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up,
- ACE_ES_Correlation_Module *down)
+ ACE_ES_Correlation_Module *down)
{
up_ = up;
down_ = down;
// 1 == 2.
}
-ACE_INLINE void
-ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer,
- CORBA::Environment &_env)
+ACE_INLINE void
+ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer
+ TAO_ENV_ARG_DECL)
{
- down_->connected (consumer, _env);
+ down_->connected (consumer TAO_ENV_ARG_PARAMETER);
}
-ACE_INLINE void
+ACE_INLINE void
ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
{
// Do nothing.
@@ -169,10 +169,10 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
}
ACE_INLINE void
-ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer,
- CORBA::Environment &_env)
+ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer
+ TAO_ENV_ARG_DECL)
{
- down_->disconnecting (consumer, _env);
+ down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER);
}
ACE_INLINE void
@@ -186,7 +186,7 @@ ACE_ES_Dispatching_Base::dispatch_queue_closed (ACE_ES_Dispatch_Queue *q)
#if defined (ACE_WIN32)
ACE_INLINE
ACE_ES_ReactorEx_NS::ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh,
- TAO_EC_Timer_Module* tm)
+ TAO_EC_Timer_Module* tm)
: ACE_Notification_Strategy (eh, ACE_Event_Handler::NULL_MASK),
timer_module_ (tm)
{
@@ -196,28 +196,28 @@ ACE_INLINE int
ACE_ES_ReactorEx_NS::open (void)
{
return this->timer_module_->register_handler (0,
- eh_,
- event_.handle ());
+ eh_,
+ event_.handle ());
}
ACE_INLINE void
ACE_ES_ReactorEx_NS::shutdown (void)
{
// @@ TODO: Fix this.
-// this->timer_module_->remove_handler (0,
-// eh_,
-// ACE_Event_Handler::DONT_CALL);
+// this->timer_module_->remove_handler (0,
+// eh_,
+// ACE_Event_Handler::DONT_CALL);
}
-ACE_INLINE int
+ACE_INLINE int
ACE_ES_ReactorEx_NS::notify (void)
{
return this->event_.signal ();
}
-ACE_INLINE int
+ACE_INLINE int
ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *,
- ACE_Reactor_Mask)
+ ACE_Reactor_Mask)
{
return this->event_.signal ();
}
@@ -226,9 +226,9 @@ ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *,
// This class is only necessary on non-win32 platforms.
ACE_INLINE
ACE_ES_Reactor_NS::ACE_ES_Reactor_NS (ACE_Event_Handler *eh,
- TAO_EC_Timer_Module *tm)
+ TAO_EC_Timer_Module *tm)
: ACE_Reactor_Notification_Strategy (tm->reactor (0),
- eh, ACE_Event_Handler::READ_MASK)
+ eh, ACE_Event_Handler::READ_MASK)
{
}