Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -4,6 +4,8 @@
/**
* @file Reactor_Timer_Interface.h
*
* $Id: Reactor_Timer_Interface.h 80826 2008-03-04 14:51:23Z wotte $
*
* @author Irfan Pyarali <irfan@oomworks.com>
*/
//=============================================================================
@ -31,6 +33,7 @@ class ACE_Event_Handler;
class ACE_Export ACE_Reactor_Timer_Interface
{
public:
virtual ~ACE_Reactor_Timer_Interface (void);
virtual long schedule_timer (ACE_Event_Handler *event_handler,
@ -38,30 +41,8 @@ public:
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,
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);
}
#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)
{
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,