*** empty log message ***

3 files changed, 5 insertions, 4 deletions

diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 86ec5ce6615..4d88cb95291 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -1346,6 +1346,7 @@ ACE_Reactor::wait_for_multiple_events (ACE_Reactor_Handle_Set &dispatch_set,
 {
   ACE_TRACE ("ACE_Reactor::wait_for_multiple_events");
   u_long width = 0;
+  ACE_Time_Value the_timeout(0) ;
 
   int number_of_active_handles = this->any_ready (dispatch_set);
 
@@ -1356,7 +1357,7 @@ ACE_Reactor::wait_for_multiple_events (ACE_Reactor_Handle_Set &dispatch_set,
     {
       do
 	{
-	  (void) this->timer_queue_->calculate_timeout (max_wait_time, max_wait_time);
+	  (void) this->timer_queue_->calculate_timeout (max_wait_time, &the_timeout);
       
 	  width = (u_long) this->handler_rep_.max_handlep1 ();
 
@@ -1368,7 +1369,7 @@ ACE_Reactor::wait_for_multiple_events (ACE_Reactor_Handle_Set &dispatch_set,
 						     dispatch_set.rd_mask_, 
 						     dispatch_set.wr_mask_, 
 						     dispatch_set.ex_mask_, 
-						     max_wait_time);
+						     &the_timeout);
 	} 
       while (number_of_active_handles == -1 && this->handle_error () > 0);
 
diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp
index 759b122f071..ecba1017b41 100644
--- a/ace/Timer_Queue_T.cpp
+++ b/ace/Timer_Queue_T.cpp
@@ -87,7 +87,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::calculate_timeout (ACE_Time_Value *max_w
 
 template <class TYPE, class FUNCTOR, class LOCK> ACE_Time_Value *
 ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::calculate_timeout (ACE_Time_Value *max_wait_time,
-							   ACE_Time_Value*& the_timeout)
+							   ACE_Time_Value *the_timeout)
 {
   ACE_TRACE ("ACE_Timer_Queue_T::calculate_timeout");
   
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index fdcb549587c..5f4a9952c7a 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -243,7 +243,7 @@ public:
   // no pending timers or if all pending timers are longer than max.
 
   virtual ACE_Time_Value *calculate_timeout (ACE_Time_Value *max,
-					     ACE_Time_Value *&the_timeout);
+					     ACE_Time_Value *the_timeout);
   // Determine the next event to timeout.  Returns <max> if there are
   // no pending timers or if all pending timers are longer than max.
   // <the_timeout> should be a pointer to storage for the timeout value,