*** empty log message ***

1 files changed, 34 insertions, 32 deletions

diff --git a/ace/Select_Reactor.i b/ace/Select_Reactor.i
index 15bc5769f86..6cfc2738585 100644
--- a/ace/Select_Reactor.i
+++ b/ace/Select_Reactor.i
@@ -1,6 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
+#include "ace/Reactor.h"
+
 ACE_INLINE
 ACE_Event_Tuple::~ACE_Event_Tuple (void)
 {
@@ -41,11 +43,11 @@ ACE_Select_Reactor::resume_handler (const ACE_Handle_Set &handles)
   ACE_HANDLE h;
 
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, ace_mon, this->token_, -1));
-  
+
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
     if (this->resume_i (h) == -1)
       return -1;
-  
+
   return 0;
 }
 
@@ -64,31 +66,31 @@ ACE_Select_Reactor::suspend_handler (const ACE_Handle_Set &handles)
   ACE_HANDLE h;
 
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, ace_mon, this->token_, -1));
-  
+
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
     if (this->suspend_i (h) == -1)
       return -1;
-  
+
   return 0;
 }
 
 ACE_INLINE int
-ACE_Select_Reactor::register_handler (int signum, 
-				      ACE_Event_Handler *new_sh, 
-				      ACE_Sig_Action *new_disp, 
+ACE_Select_Reactor::register_handler (int signum,
+				      ACE_Event_Handler *new_sh,
+				      ACE_Sig_Action *new_disp,
 				      ACE_Event_Handler **old_sh,
 				      ACE_Sig_Action *old_disp)
 {
   ACE_TRACE ("ACE_Select_Reactor::register_handler");
-  return this->signal_handler_->register_handler (signum, 
+  return this->signal_handler_->register_handler (signum,
 						  new_sh, new_disp,
-						  old_sh, old_disp); 
+						  old_sh, old_disp);
 }
 
 #if defined (ACE_WIN32)
 
-ACE_INLINE int 
-ACE_Select_Reactor::register_handler (ACE_Event_Handler *event_handler, 
+ACE_INLINE int
+ACE_Select_Reactor::register_handler (ACE_Event_Handler *event_handler,
 				      ACE_HANDLE event_handle)
 {
   // Don't have an implementation for this yet...
@@ -99,10 +101,10 @@ ACE_Select_Reactor::register_handler (ACE_Event_Handler *event_handler,
 
 #endif /* ACE_WIN32 */
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::register_handler (ACE_HANDLE event_handle,
 				      ACE_HANDLE io_handle,
-				      ACE_Event_Handler *event_handler, 
+				      ACE_Event_Handler *event_handler,
 				      ACE_Reactor_Mask mask)
 {
   // Don't have an implementation for this yet...
@@ -121,8 +123,8 @@ ACE_Select_Reactor::handler (int signum, ACE_Event_Handler **handler)
 }
 
 ACE_INLINE int
-ACE_Select_Reactor::remove_handler (int signum, 
-				    ACE_Sig_Action *new_disp, 
+ACE_Select_Reactor::remove_handler (int signum,
+				    ACE_Sig_Action *new_disp,
 				    ACE_Sig_Action *old_disp,
 				    int sigkey)
 {
@@ -146,17 +148,17 @@ ACE_Select_Reactor::cancel_timer (ACE_Event_Handler *handler,
 				  int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Select_Reactor::cancel_timer");
-  return this->timer_queue_ != 0 && 
+  return this->timer_queue_ != 0 &&
     this->timer_queue_->cancel (handler, dont_call_handle_close);
 }
 
 ACE_INLINE int
-ACE_Select_Reactor::cancel_timer (long timer_id, 
+ACE_Select_Reactor::cancel_timer (long timer_id,
 				  const void **arg,
 				  int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Select_Reactor::cancel_timer");
-  return this->timer_queue_->cancel (timer_id, 
+  return this->timer_queue_->cancel (timer_id,
 				     arg,
 				     dont_call_handle_close);
 }
@@ -164,8 +166,8 @@ ACE_Select_Reactor::cancel_timer (long timer_id,
 // Performs operations on the "ready" bits.
 
 ACE_INLINE int
-ACE_Select_Reactor::ready_ops (ACE_Event_Handler *handler, 
-			       ACE_Reactor_Mask mask, 
+ACE_Select_Reactor::ready_ops (ACE_Event_Handler *handler,
+			       ACE_Reactor_Mask mask,
 			       int ops)
 {
   ACE_TRACE ("ACE_Select_Reactor::ready_ops");
@@ -175,15 +177,15 @@ ACE_Select_Reactor::ready_ops (ACE_Event_Handler *handler,
 // Performs operations on the "dispatch" masks.
 
 ACE_INLINE int
-ACE_Select_Reactor::mask_ops (ACE_Event_Handler *handler, 
-			      ACE_Reactor_Mask mask, 
+ACE_Select_Reactor::mask_ops (ACE_Event_Handler *handler,
+			      ACE_Reactor_Mask mask,
 			      int ops)
 {
   ACE_TRACE ("ACE_Select_Reactor::mask_ops");
   return this->mask_ops (handler->get_handle (), mask, ops);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::schedule_wakeup (ACE_Event_Handler *eh,
 				     ACE_Reactor_Mask mask)
 {
@@ -191,7 +193,7 @@ ACE_Select_Reactor::schedule_wakeup (ACE_Event_Handler *eh,
   return this->mask_ops (eh->get_handle (), mask, ACE_Reactor::ADD_MASK);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::cancel_wakeup (ACE_Event_Handler *eh,
 				   ACE_Reactor_Mask mask)
 {
@@ -199,7 +201,7 @@ ACE_Select_Reactor::cancel_wakeup (ACE_Event_Handler *eh,
   return this->mask_ops (eh->get_handle (), mask, ACE_Reactor::CLR_MASK);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::schedule_wakeup (ACE_HANDLE handle,
 				     ACE_Reactor_Mask mask)
 {
@@ -207,7 +209,7 @@ ACE_Select_Reactor::schedule_wakeup (ACE_HANDLE handle,
   return this->mask_ops (handle, mask, ACE_Reactor::ADD_MASK);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::cancel_wakeup (ACE_HANDLE handle,
 				   ACE_Reactor_Mask mask)
 {
@@ -230,25 +232,25 @@ ACE_Select_Reactor::wakeup_all_threads (void)
   this->notify (0, ACE_Event_Handler::NULL_MASK, (ACE_Time_Value *) &ACE_Time_Value::zero);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::alertable_handle_events (ACE_Time_Value *max_wait_time)
 {
   return this->handle_events (max_wait_time);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_Select_Reactor::alertable_handle_events (ACE_Time_Value &max_wait_time)
 {
   return this->handle_events (max_wait_time);
 }
 
-ACE_INLINE size_t 
+ACE_INLINE size_t
 ACE_Select_Reactor_Handler_Repository::size (void)
 {
   return this->max_size_;
 }
 
-ACE_INLINE size_t 
+ACE_INLINE size_t
 ACE_Select_Reactor::size (void)
 {
   return this->handler_rep_.size ();
@@ -258,10 +260,10 @@ ACE_Select_Reactor::size (void)
 ACE_INLINE
 ACE_Event_Tuple::ACE_Event_Tuple (void)
 :  handle_ (ACE_INVALID_HANDLE),
-   event_handler_ (0) 
+   event_handler_ (0)
 {
 }
-		   
+
 ACE_INLINE
 ACE_Event_Tuple::ACE_Event_Tuple (ACE_Event_Handler* eh,
 				  ACE_HANDLE h)