diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Timer_Wheel.h | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Timer_Wheel.h')
| -rw-r--r-- | dep/acelite/ace/Timer_Wheel.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dep/acelite/ace/Timer_Wheel.h b/dep/acelite/ace/Timer_Wheel.h index 21ba8776102..12b8bff0d5d 100644 --- a/dep/acelite/ace/Timer_Wheel.h +++ b/dep/acelite/ace/Timer_Wheel.h @@ -4,7 +4,7 @@ /** * @file Timer_Wheel.h * - * $Id: Timer_Wheel.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Timer_Wheel.h 95335 2011-12-15 13:13:17Z msmit $ * * @author Darrell Brunsch (brunsch@cs.wustl.edu) */ @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/Timer_Wheel_T.h" +#include "ace/Event_Handler_Handle_Timeout_Upcall.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,13 +28,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // compatibility. typedef ACE_Timer_Wheel_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> ACE_Timer_Wheel; typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> + ACE_Event_Handler_Handle_Timeout_Upcall, + ACE_SYNCH_RECURSIVE_MUTEX, + ACE_Default_Time_Policy> ACE_Timer_Wheel_Iterator; ACE_END_VERSIONED_NAMESPACE_DECL |