Skip to content

Commit

Permalink
Merge pull request #2301 from sonndinh/remove-dup-reactor-functions
Browse files Browse the repository at this point in the history
Consolidate reactor timer management functions
  • Loading branch information
jrw972 authored Nov 22, 2024
2 parents 3d492fa + ef42200 commit 117ca73
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions ACE/ace/Reactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -571,17 +571,7 @@ class ACE_Export ACE_Reactor : public ACE_Reactor_Timer_Interface
const ACE_Time_Value &interval =
ACE_Time_Value::zero);

template<class Rep1, class Period1, class Rep2 = int, class Period2 = std::ratio<1>>
long schedule_timer (ACE_Event_Handler *event_handler,
const void *arg,
const std::chrono::duration<Rep1, Period1>& delay,
const std::chrono::duration<Rep2, Period2>& interval =
std::chrono::duration<Rep2, Period2>::zero ())
{
ACE_Time_Value const tv_delay (delay);
ACE_Time_Value const tv_interval (interval);
return this->schedule_timer (event_handler, arg, tv_delay, tv_interval);
}
using ACE_Reactor_Timer_Interface::schedule_timer;

/**
* Reset recurring timer interval.
Expand All @@ -597,13 +587,7 @@ class ACE_Export ACE_Reactor : public ACE_Reactor_Timer_Interface
virtual int reset_timer_interval (long timer_id,
const ACE_Time_Value &interval);

template<class Rep, class Period>
int reset_timer_interval (long timer_id,
const std::chrono::duration<Rep, Period>& interval)
{
ACE_Time_Value const tv_interval (interval);
return this->reset_timer_interval (timer_id, tv_interval);
}
using ACE_Reactor_Timer_Interface::reset_timer_interval;

/**
* Cancel timer.
Expand Down

0 comments on commit 117ca73

Please sign in to comment.