diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-06-10 10:09:28 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-06-10 10:09:28 +0000 |
| commit | 6888e47ec7b09ecc21f58c7e34af4fa24892164f (patch) | |
| tree | 68f88dd2325e8d8b340ab40eb89f100d2de1c053 | |
| parent | 0e76b33280ceecc151aa526478f92228feecbc89 (diff) | |
| download | ATCD-6888e47ec7b09ecc21f58c7e34af4fa24892164f.tar.gz | |
ChangeLog tag: Sat Jun 10 10:07:32 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/Thread_Manager.cpp | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4896d04b4a3..45d118616c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 10 10:07:32 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Thread_Manager.cpp: + Fix for compiler errors. + Sat Jun 10 04:31:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * bin/MakeProjectCreator/config/automake.features: diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 7f824f75eae..3a541064987 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -8,6 +8,9 @@ #include "ace/Auto_Ptr.h" #include "ace/Guard_T.h" +#include "ace/Time_Value.h" +#include "ace/OS_NS_sys_time.h" + #if !defined (__ACE_INLINE__) #include "ace/Thread_Manager.inl" #endif /* __ACE_INLINE__ */ @@ -1740,9 +1743,14 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout, { ACE_TRACE ("ACE_Thread_Manager::wait"); + ACE_Time_Value local_timeout; // Check to see if we're using absolute time or not. if (use_absolute_time == 0 && timeout != 0) - *timeout += ACE_OS::gettimeofday (); + { + local_timeout = *timeout; + local_timeout += ACE_OS::gettimeofday (); + timeout = &local_timeout; + } #if !defined (ACE_VXWORKS) ACE_Double_Linked_List<ACE_Thread_Descriptor_Base> term_thr_list_copy; |