diff options
Diffstat (limited to 'ACE/ace/Reactor_Timer_Interface.h')
| -rw-r--r-- | ACE/ace/Reactor_Timer_Interface.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ACE/ace/Reactor_Timer_Interface.h b/ACE/ace/Reactor_Timer_Interface.h index 3000d93b1d0..71202e0ccf7 100644 --- a/ACE/ace/Reactor_Timer_Interface.h +++ b/ACE/ace/Reactor_Timer_Interface.h @@ -31,14 +31,13 @@ class ACE_Event_Handler; class ACE_Export ACE_Reactor_Timer_Interface { public: - virtual ~ACE_Reactor_Timer_Interface (void); + virtual ~ACE_Reactor_Timer_Interface (); virtual long schedule_timer (ACE_Event_Handler *event_handler, const void *arg, const ACE_Time_Value &delay, const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; -#if defined (ACE_HAS_CPP11) template<class Rep1, class Period1, class Rep2 = int, class Period2 = std::ratio<1>> long schedule_timer (ACE_Event_Handler *event_handler, const void *arg, @@ -49,11 +48,10 @@ public: ACE_Time_Value const tv_interval (interval); return this->schedule_timer (event_handler, arg, tv_delay, tv_interval); } -#endif virtual int reset_timer_interval (long timer_id, const ACE_Time_Value &interval) = 0; -#if defined (ACE_HAS_CPP11) + template<class Rep, class Period> int reset_timer_interval (long timer_id, const std::chrono::duration<Rep, Period>& interval) @@ -61,7 +59,6 @@ public: ACE_Time_Value const tv_interval (interval); return this->reset_timer_interval (timer_id, tv_interval); } -#endif virtual int cancel_timer (long timer_id, const void **arg = 0, |