diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 07:31:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-28 07:31:41 +0000 |
| commit | ecbdc163087056dfa75cfa90df0165cd4575910b (patch) | |
| tree | 95d45bd2c95ab1da48e1c1c827d031b5730520a1 | |
| parent | 1d2236abbd74d3bed65f2e7e40d991ce2920b247 (diff) | |
| download | ATCD-ecbdc163087056dfa75cfa90df0165cd4575910b.tar.gz | |
Wed Nov 28 07:30:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Timer_Queue_Adapters.cpp | 5 | ||||
| -rw-r--r-- | ACE/ace/Timer_Queue_Adapters.h | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index bbdb6c703fa..a98a8c16d76 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 28 07:30:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Timer_Queue_Adapters.{h,cpp}: + Updated activate method because of new argument in the base + class + Tue Nov 27 14:16:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_linux.GNU: diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index fff641ce613..e261eae6e2d 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -300,7 +300,8 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::activate (long flags, ACE_hthread_t [], void *stack[], size_t stack_size[], - ACE_thread_t thread_names[]) + ACE_thread_t thread_ids[], + const char* thr_name[] = 0) { // Make sure to set this flag in case we were deactivated earlier. this->active_ = true; @@ -308,7 +309,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::activate (long flags, // Make sure that we only allow a single thread to be spawned for // our adapter. Otherwise, too many weird things can happen. return ACE_Task_Base::activate (flags, 1, 0, priority, grp_id, task, 0, - stack, stack_size, thread_names); + stack, stack_size, thread_ids, thr_name); } # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 96b7e33db24..08ea47075f3 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -186,7 +186,8 @@ public: ACE_hthread_t thread_handles[] = 0, void *stack[] = 0, size_t stack_size[] = 0, - ACE_thread_t thread_names[] = 0); + ACE_thread_t thread_ids[] = 0, + const char* thr_name[] = 0); # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) |