diff options
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Timer_List_T.cpp | 7 | ||||
| -rw-r--r-- | ace/Timer_List_T.h | 2 | ||||
| -rw-r--r-- | ace/Timer_Wheel_T.cpp | 6 | ||||
| -rw-r--r-- | ace/Timer_Wheel_T.h | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp index 52516cbd4d9..d76ecba5b21 100644 --- a/ace/Timer_List_T.cpp +++ b/ace/Timer_List_T.cpp @@ -298,7 +298,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, skip_close, cookie); - this->cancel_i (n, skip_close); + this->cancel_i (n); return 1; } @@ -328,7 +328,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, int skip_cl ACE_Timer_Node_T<TYPE>* tmp = n; n = n->get_next(); - this->cancel_i (tmp, skip_close); + this->cancel_i (tmp); } else { @@ -371,8 +371,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::unlink (ACE_Timer_Node_T<TYPE>* n) /// Shared subset of the two cancel() methods. template <class TYPE, class FUNCTOR, class ACE_LOCK> void -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel_i (ACE_Timer_Node_T<TYPE>* n, - int skip_close) +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel_i (ACE_Timer_Node_T<TYPE>* n) { this->unlink (n); this->free_node (n); diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h index 42ce2a2eab0..8ba82053b94 100644 --- a/ace/Timer_List_T.h +++ b/ace/Timer_List_T.h @@ -188,7 +188,7 @@ private: ACE_Timer_Node_T<TYPE>* find_node(long timer_id) const; - void cancel_i (ACE_Timer_Node_T<TYPE>* n, int skip_close); + void cancel_i (ACE_Timer_Node_T<TYPE>* n); void unlink (ACE_Timer_Node_T<TYPE>* n); diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index dab38390c41..4bcdb11b3e9 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -533,7 +533,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE& type, int skip_c ACE_Timer_Node_T<TYPE>* tmp = n; n = n->get_next (); - this->cancel_i (tmp, skip_close); + this->cancel_i (tmp); } else { @@ -618,7 +618,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, if (act != 0) *act = n->get_act (); - this->cancel_i (n, skip_close); + this->cancel_i (n); if (recalc) this->recalc_earliest (last); @@ -630,7 +630,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, /// Shared subset of the two cancel() methods. template <class TYPE, class FUNCTOR, class ACE_LOCK> void -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel_i (ACE_Timer_Node_T<TYPE>* n, int skip_close) +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel_i (ACE_Timer_Node_T<TYPE>* n) { this->unlink (n); this->free_node (n); diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h index 62f7ab916f1..6450a959bd4 100644 --- a/ace/Timer_Wheel_T.h +++ b/ace/Timer_Wheel_T.h @@ -178,7 +178,7 @@ private: u_int calculate_spoke(const ACE_Time_Value& expire) const; long generate_timer_id(u_int spoke); void schedule_i (ACE_Timer_Node_T<TYPE>* n, u_int spoke, const ACE_Time_Value& expire); - void cancel_i (ACE_Timer_Node_T<TYPE>* n, int skip_close); + void cancel_i (ACE_Timer_Node_T<TYPE>* n); void unlink (ACE_Timer_Node_T<TYPE>* n); void recalc_earliest(const ACE_Time_Value& last); |