From 9d1004206324867a4287e99b9675d24e536fa090 Mon Sep 17 00:00:00 2001 From: mcorino Date: Thu, 15 Dec 2011 11:09:41 +0000 Subject: Thu Dec 15 11:00:00 UTC 2011 Martin Corino Merged timer_policy branch. --- ACE/ace/Timer_Hash.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'ACE/ace/Timer_Hash.h') diff --git a/ACE/ace/Timer_Hash.h b/ACE/ace/Timer_Hash.h index 2d959be39c5..5a2bb32e421 100644 --- a/ACE/ace/Timer_Hash.h +++ b/ACE/ace/Timer_Hash.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/Timer_Hash_T.h" +#include "ace/Event_Handler_Handle_Timeout_Upcall.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // The following typedef are here for ease of use typedef ACE_Timer_Hash_Upcall , + ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX> ACE_Hash_Upcall; @@ -45,26 +46,27 @@ typedef ACE_Timer_Heap_T , + ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List> ACE_Timer_Hash; typedef ACE_Timer_Hash_Iterator_T, + ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX, - ACE_Hash_Timer_List> + ACE_Hash_Timer_List, + ACE_Default_Time_Policy> ACE_Timer_Hash_Iterator; typedef ACE_Timer_Hash_T, + ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap> ACE_Timer_Hash_Heap; typedef ACE_Timer_Hash_Iterator_T, + ACE_Event_Handler_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap> ACE_Timer_Hash_Heap_Iterator; -- cgit v1.2.1