diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-04-25 20:01:23 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-04-25 20:01:23 +0000 |
commit | c465cc4564980acff3b239de148d0ff996b98091 (patch) | |
tree | e0991248f64d72c6c914906ca56f85e7a5a79af2 /ace/Timer_Queue.cpp | |
parent | 6933852ff0038829575a6ddc3428569024e64353 (diff) | |
download | ATCD-c465cc4564980acff3b239de148d0ff996b98091.tar.gz |
*** empty log message ***
Diffstat (limited to 'ace/Timer_Queue.cpp')
-rw-r--r-- | ace/Timer_Queue.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp index 77a0b274f02..6ae40a409e9 100644 --- a/ace/Timer_Queue.cpp +++ b/ace/Timer_Queue.cpp @@ -38,7 +38,7 @@ ACE_Timer_Node_T<TYPE, FUNCTOR>::ACE_Timer_Node_T (const TYPE &type, const void *a, const ACE_Time_Value &t, const ACE_Time_Value &i, - NODE *n, + ACE_Timer_Node_T<TYPE, FUNCTOR> *n, int timer_id) : type_ (type), act_ (a), @@ -118,9 +118,9 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR>::dump (void) const template <class TYPE, class FUNCTOR> ACE_Timer_Queue_T<TYPE, FUNCTOR>::ACE_Timer_Queue_T (FUNCTOR *upcall_functor) : gettimeofday_ (ACE_OS::gettimeofday), - timer_skew_ (0, ACE_TIMER_SKEW), upcall_functor_ (upcall_functor == 0 ? *(new FUNCTOR) : *upcall_functor), - delete_upcall_functor_ (upcall_functor == 0) + delete_upcall_functor_ (upcall_functor == 0), + timer_skew_ (0, ACE_TIMER_SKEW) { ACE_TRACE ("ACE_Timer_Queue::ACE_Timer_Queue"); } @@ -194,7 +194,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR>::upcall (TYPE &type, { // This calls the correct operator () on the functor (the one with // four args) - this->upcall_functor_ (*this, type, act, cur_time); + this->upcall_functor_.operator () (*this, type, act, cur_time); } |