diff options
| -rw-r--r-- | ChangeLog-97b | 7 | ||||
| -rw-r--r-- | ace/Timer_Queue_T.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 0b593254cf8..a76f7f6261e 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,10 @@ +Sat Sep 20 11:47:14 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> + + * ace/Timer_Queue_T.cpp: + Changed the return type to <int>, to match its declaration. The + intent was to error error values, which are declared as <int> + throughout ACE. + Sat Sep 20 08:07:36 1997 David L. Levine <levine@cs.wustl.edu> * ace/Timer_Queue_T.h (schedule_ualaram): changed return type diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp index a3bf1455c58..6d66cf00675 100644 --- a/ace/Timer_Queue_T.cpp +++ b/ace/Timer_Queue_T.cpp @@ -307,7 +307,7 @@ ACE_Async_Timer_Queue_Adapter<TQ>::expire (void) return this->timer_queue_.expire (); } -template <class TQ> long +template <class TQ> int ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm (void) { ACE_Time_Value tv = this->timer_queue_.earliest_time () |