summaryrefslogtreecommitdiff
path: root/ACE/ace/Timer_Queue_Adapters.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-03-15 07:58:50 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-03-15 07:58:50 +0000
commitf4ae2613c87ce239858f59a186003a1af9a51b71 (patch)
tree9b8c1c973166673790471894ab504ad96b41d9eb /ACE/ace/Timer_Queue_Adapters.inl
parent7a4083a23538862fc17c025b64f45c29c29ada0c (diff)
downloadATCD-f4ae2613c87ce239858f59a186003a1af9a51b71.tar.gz
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
Diffstat (limited to 'ACE/ace/Timer_Queue_Adapters.inl')
-rw-r--r--ACE/ace/Timer_Queue_Adapters.inl12
1 files changed, 6 insertions, 6 deletions
diff --git a/ACE/ace/Timer_Queue_Adapters.inl b/ACE/ace/Timer_Queue_Adapters.inl
index 3252b186e07..16901a15bd6 100644
--- a/ACE/ace/Timer_Queue_Adapters.inl
+++ b/ACE/ace/Timer_Queue_Adapters.inl
@@ -4,14 +4,14 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-template<class TQ> ACE_INLINE TQ *
-ACE_Thread_Timer_Queue_Adapter<TQ>::timer_queue (void) const
+template<class TQ, class TYPE> ACE_INLINE TQ *
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::timer_queue (void) const
{
return this->timer_queue_;
}
-template<class TQ> ACE_INLINE int
-ACE_Thread_Timer_Queue_Adapter<TQ>::timer_queue (TQ *tq)
+template<class TQ, class TYPE> ACE_INLINE int
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::timer_queue (TQ *tq)
{
if (this->delete_timer_queue_)
delete this->timer_queue_;
@@ -20,8 +20,8 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::timer_queue (TQ *tq)
return 0;
}
-template<class TQ> ACE_INLINE ACE_thread_t
-ACE_Thread_Timer_Queue_Adapter<TQ>::thr_id (void) const
+template<class TQ, class TYPE> ACE_INLINE ACE_thread_t
+ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::thr_id (void) const
{
return this->thr_id_;
}