Mon Mar 15 07:58:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

	* ace/High_Res_Timer.cpp
	* ace/High_Res_Timer.h
	* ace/High_Res_Timer.inl
	  Use 64bit calculations to increase our precision. If you want to have the 32bit
	  calculations, add ACE_USE_WINDOWS_32BIT_HIGH_RES_TIMER_CALCULATIONS as define. If
	  the scoreboard doesn't show any platforms requiring 32bit, we will remove that code
	  before the next micro release goes out
	  Thanks to Alon Diamant <diamant dot alon at gmail dot com> for supplying the patches.
	  This fixes bugzilla 3703.

	* ace/Timer_Queue_Adapters.cpp
	* ace/Timer_Queue_Adapters.h
	* ace/Timer_Queue_Adapters.inl
	  Make it possible to use a customer event handler in ACE_Thread_Timer_Queue_Adapter.
	  Thanks to Alon Diamant <diamant dot alon at gmail dot com> for supplying the patches.
	  This fixes bugzilla 3614

	* tests/tests.mpc:
	* tests/Thread_Timer_Queue_Adapter_Test.cpp:
	  New test for testing custom event handlers in ACE_Thread_Timer_Queue_Adapter.
	  Thanks to Alon Diamant <diamant dot alon at gmail dot com> for creating
	  this new test

1 files changed, 4 insertions, 4 deletions

diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h
index 08ea47075f3..4611239fb02 100644
--- a/ACE/ace/Timer_Queue_Adapters.h
+++ b/ACE/ace/Timer_Queue_Adapters.h
@@ -49,7 +49,7 @@ class ACE_Sig_Set;
  *
  * @todo This adapter does not automatically reschedule repeating timers.
  */
-template <class TQ>
+template <class TQ, class TYPE = ACE_Event_Handler*>
 class ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler
 {
 public:
@@ -70,7 +70,7 @@ public:
    * calling expire().  Note that interval timers are not implemented
    * yet.
    */
-  long schedule (ACE_Event_Handler *type,
+  long schedule (TYPE type,
                  const void *act,
                  const ACE_Time_Value &future_time,
                  const ACE_Time_Value &interval = ACE_Time_Value::zero);
@@ -119,7 +119,7 @@ private:
  * use.
  *
  */
-template <class TQ>
+template <class TQ, class TYPE = ACE_Event_Handler*>
 class ACE_Thread_Timer_Queue_Adapter : public ACE_Task_Base
 {
 public:
@@ -145,7 +145,7 @@ public:
 
   /// Schedule the timer according to the semantics of the <TQ>; wakes
   /// up the dispatching thread.
-  long schedule (ACE_Event_Handler *handler,
+  long schedule (TYPE handler,
                  const void *act,
                  const ACE_Time_Value &future_time,
                  const ACE_Time_Value &interval = ACE_Time_Value::zero);