*** empty log message ***

1 files changed, 41 insertions, 6 deletions

diff --git a/ace/Timer_Queue_T.i b/ace/Timer_Queue_T.i
index a69b5b3d284..4778691bb72 100644
--- a/ace/Timer_Queue_T.i
+++ b/ace/Timer_Queue_T.i
@@ -3,23 +3,58 @@
 
 // Timer_Queue_T.i
 
-template <class TYPE, class FUNCTOR> ACE_INLINE void
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (const ACE_Time_Value &skew)
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE void
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::timer_skew (const ACE_Time_Value &skew)
 {
   timer_skew_ = skew;
 }
 
-template <class TYPE, class FUNCTOR> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::timer_skew (void) const
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE const ACE_Time_Value &
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::timer_skew (void) const
 {
   return timer_skew_;
 }
 
-template <class TYPE, class FUNCTOR> ACE_INLINE int
-ACE_Timer_Queue_T<TYPE, FUNCTOR>::expire (void)
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE int
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::expire (void)
 {
   if (!this->is_empty ())
     return this->expire (this->gettimeofday () + timer_skew_);
   else
     return 0;
 }
+
+template <class TYPE, class FUNCTOR, class LOCK> void
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::upcall (TYPE &type,
+						const void *act,
+						const ACE_Time_Value &cur_time)
+{
+  this->upcall_functor_.timeout (*this, type, act, cur_time);
+}
+
+
+template <class TYPE, class FUNCTOR, class LOCK> ACE_Time_Value
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::gettimeofday (void)
+{
+  // Invoke gettimeofday via pointer to function.
+  return gettimeofday_ ();
+}
+
+template <class TYPE, class FUNCTOR, class LOCK> void
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::gettimeofday (ACE_Time_Value (*gettimeofday)(void))
+{
+  gettimeofday_ = gettimeofday;
+}
+
+template <class TYPE, class FUNCTOR, class LOCK> LOCK &
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::lock (void)
+{
+  return this->lock_;
+}
+
+template <class TYPE, class FUNCTOR, class LOCK> FUNCTOR &
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::upcall_functor (void)
+{
+  return this->upcall_functor_;
+}
+