diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-05-03 22:44:29 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-05-03 22:44:29 +0000 |
commit | 40645c36540e1748d9f936e2a2575cf64eda7140 (patch) | |
tree | f259a828748eac9e886983e3f9d3e44f0a0a8d1c /ace/Timer_Wheel_T.cpp | |
parent | 06c2721e569ce32160c089e2672647bad41dbdd0 (diff) | |
download | ATCD-40645c36540e1748d9f936e2a2575cf64eda7140.tar.gz |
*** empty log message ***
Diffstat (limited to 'ace/Timer_Wheel_T.cpp')
-rw-r--r-- | ace/Timer_Wheel_T.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index aef170018f8..a50d534dbf3 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -158,7 +158,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR>::earliest_time (void) const } -template <class TYPE, class FUNCTOR> int +template <class TYPE, class FUNCTOR> long ACE_Timer_Wheel_T<TYPE, FUNCTOR>::schedule (const TYPE &type, const void *act, const ACE_Time_Value &delay, @@ -170,21 +170,21 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR>::schedule (const TYPE &type, ACE_Timer_Node_T<TYPE, FUNCTOR> *tempnode = this->alloc_node (); if (tempnode) - { - // Note that the timer_id is actually the pointer to the node + { + // Note that the timer_id is actually the pointer to the node - // Use operator placement new. - new (tempnode) ACE_Timer_Node_T<TYPE, FUNCTOR> (type, - act, - delay, - interval, - NULL, - NULL, - (int) tempnode); - - this->reschedule (tempnode); - return tempnode->timer_id_; - } + // Use operator placement new. + new (tempnode) ACE_Timer_Node_T<TYPE, FUNCTOR> (type, + act, + delay, + interval, + NULL, + NULL, + (long) tempnode); + + this->reschedule (tempnode); + return tempnode->timer_id_; + } // Failure return. errno = ENOMEM; @@ -235,7 +235,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR>::cancel (const TYPE &type, } template <class TYPE, class FUNCTOR> int -ACE_Timer_Wheel_T<TYPE, FUNCTOR>::cancel (int timer_id, +ACE_Timer_Wheel_T<TYPE, FUNCTOR>::cancel (long timer_id, const void **act, int dont_call_handle_close) { |