Thu Jul 2 02:55:09 UTC 2009 Carlos O'Ryan <coryan@glamdring>

        * ace/Abstract_Timer_Queue.h:
        * ace/Timer_Queue_T.h:
        * ace/Timer_Queue_T.inl:
        * ace/Timer_Queue_T.cpp:
          I wanted to use gettimeofday() for the pure virtual function and
          some other name for the inline function used in the timer queue
          internals.
          This is the second and final pass to get that change in.  This
          time, I renamed the internal function to gettimeofday_static(),
          used the compiler (and grep) to find all uses.  Once that
          compiled I renamed the virtual function from
          gettimeofday_abstract() to the gettimeofday() function.
          I know it is convoluted, but it gets the job done without me
          having to think too much.

        * ace/Timer_Hash_T.h:
        * ace/Timer_Hash_T.cpp:
        * ace/Select_Reactor_T.cpp:
        * ace/Dev_Poll_Reactor.cpp:
        * ace/Proactor.cpp:
        * ace/Timer_Queue_Adapters.cpp:
        * tests/Timer_Queue_Reference_Counting_Test.cpp:
        * tests/Timer_Queue_Test.cpp:
        * examples/APG/Timers/Timers.cpp:
        * examples/APG/Timers/TimerDispatcher.cpp:
        * examples/C++NPv2/Logging_Event_Handler_Ex.cpp:
          Fixed users and tests to use the real name for gettimeofday() in
          ACE_Abstract_Timer_Queue<>

1 files changed, 6 insertions, 6 deletions

diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp
index d4501dc1521..da8a8f75249 100644
--- a/ACE/ace/Timer_Queue_T.cpp
+++ b/ACE/ace/Timer_Queue_T.cpp
@@ -62,9 +62,9 @@ ACE_Timer_Queue_Upcall_Base<TYPE, FUNCTOR>::~ACE_Timer_Queue_Upcall_Base ()
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Time_Value
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday_abstract()
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday()
 {
-  return this->gettimeofday();
+  return this->gettimeofday_static();
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Time_Value *
@@ -78,7 +78,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::calculate_timeout (ACE_
     return max_wait_time;
   else
     {
-      ACE_Time_Value const cur_time = this->gettimeofday ();
+      ACE_Time_Value const cur_time = this->gettimeofday_static ();
 
       if (this->earliest_time () > cur_time)
         {
@@ -123,7 +123,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::calculate_timeout (ACE_
     }
   else
     {
-      ACE_Time_Value cur_time = this->gettimeofday ();
+      ACE_Time_Value cur_time = this->gettimeofday_static ();
 
       if (this->earliest_time () > cur_time)
         {
@@ -150,7 +150,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::calculate_timeout (ACE_
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Time_Value
 ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::current_time()
 {
-  ACE_Time_Value tv = this->gettimeofday();
+  ACE_Time_Value tv = this->gettimeofday_static ();
   tv += this->timer_skew();
   return tv;
 }
@@ -289,7 +289,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire_single (
     return 0;
 
   // Get the current time
-  ACE_Time_Value cur_time (this->gettimeofday () +
+  ACE_Time_Value cur_time (this->gettimeofday_static () +
                            this->timer_skew ());
 
   // Look for a node in the timer queue whose timer <= the present