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 | 1d9cdc2996069d4ad5304bc1a131a8517bf34806 (patch) | |
| tree | e0991248f64d72c6c914906ca56f85e7a5a79af2 /ace/Timer_List.cpp | |
| parent | 946497744df95dfebce2ab67d7d6590213d19df5 (diff) | |
| download | ATCD-1d9cdc2996069d4ad5304bc1a131a8517bf34806.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace/Timer_List.cpp')
| -rw-r--r-- | ace/Timer_List.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp index f8c0a5ba17e..26a5d813b84 100644 --- a/ace/Timer_List.cpp +++ b/ace/Timer_List.cpp @@ -15,7 +15,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR>::ACE_Timer_List_Iterator_T (ACE_Timer_L template <class TYPE, class FUNCTOR> int -ACE_Timer_List_Iterator_T<TYPE, FUNCTOR>::next (NODE *&node, +ACE_Timer_List_Iterator_T<TYPE, FUNCTOR>::next (ACE_Timer_Node_T<TYPE, FUNCTOR> *&node, const ACE_Time_Value &cur_time) { if (this->timer_list_.head_ == 0 @@ -31,7 +31,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR>::next (NODE *&node, ACE_ALLOC_HOOK_DEFINE(ACE_Timer_List_T) - template <class TYPE, class FUNCTOR> ACE_Timer_Queue_T<TYPE, FUNCTOR>::ITERATOR & +template <class TYPE, class FUNCTOR> ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR> & ACE_Timer_List_T<TYPE, FUNCTOR>::iter (void) { return this->iterator_; @@ -41,7 +41,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR>::iter (void) template <class TYPE, class FUNCTOR> ACE_Timer_List_T<TYPE, FUNCTOR>::ACE_Timer_List_T (FUNCTOR *upcall_functor) - : INHERITED (upcall_functor), + : ACE_Timer_Queue_T<TYPE, FUNCTOR> (upcall_functor), head_ (0), iterator_ (*this), timer_id_ (0) @@ -60,7 +60,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR>::is_empty (void) const } -template <class TYPE, class FUNCTOR> ACE_Timer_Queue_T<TYPE, FUNCTOR>::NODE * +template <class TYPE, class FUNCTOR> ACE_Timer_Node_T<TYPE, FUNCTOR> * ACE_Timer_List_T<TYPE, FUNCTOR>::alloc_node (void) { return new NODE; @@ -68,7 +68,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR>::alloc_node (void) template <class TYPE, class FUNCTOR> void -ACE_Timer_List_T<TYPE, FUNCTOR>::free_node (NODE *node) +ACE_Timer_List_T<TYPE, FUNCTOR>::free_node (ACE_Timer_Node_T<TYPE, FUNCTOR> *node) { delete node; } @@ -117,7 +117,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR>::dump (void) const template <class TYPE, class FUNCTOR> void -ACE_Timer_List_T<TYPE, FUNCTOR>::reschedule (NODE *expired) +ACE_Timer_List_T<TYPE, FUNCTOR>::reschedule (ACE_Timer_Node_T<TYPE, FUNCTOR> *expired) { ACE_TRACE ("ACE_Timer_List::reschedule"); if (this->is_empty () @@ -250,7 +250,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR>::cancel (int timer_id, if (dont_call == 0) // This calls the correct operator () on the functor (the one with // two args) - this->upcall_functor_ (*this, curr->type_); + this->upcall_functor_.operator () (*this, curr->type_); this->free_node (curr); return 1; } @@ -283,7 +283,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR>::cancel (const TYPE &type, && number_of_cancellations == 1) // This calls the correct operator () on the functor (the one with // two args) - this->upcall_functor_ (*this, curr->type_); + this->upcall_functor_.operator () (*this, curr->type_); if (prev == 0) { this->head_ = curr->next_; |