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_Queue.h | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Timer_Queue.h')
| -rw-r--r-- | dep/acelite/ace/Timer_Queue.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dep/acelite/ace/Timer_Queue.h b/dep/acelite/ace/Timer_Queue.h index 4644aa1b43d..13ec4fc826a 100644 --- a/dep/acelite/ace/Timer_Queue.h +++ b/dep/acelite/ace/Timer_Queue.h @@ -4,7 +4,7 @@ /** * @file Timer_Queue.h * - * $Id: Timer_Queue.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Timer_Queue.h 95332 2011-12-15 11:09:41Z mcorino $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> * @author Irfan Pyarali <irfan@cs.wustl.edu> @@ -40,9 +40,7 @@ typedef ACE_Timer_Node_Dispatch_Info_T<ACE_Event_Handler *> typedef ACE_Timer_Node_T<ACE_Event_Handler *> ACE_Timer_Node; -typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, - ACE_SYNCH_RECURSIVE_MUTEX> +typedef ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *> ACE_Timer_Queue_Iterator; ACE_END_VERSIONED_NAMESPACE_DECL |