diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
| commit | 1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5 (patch) | |
| tree | 78fc0571a66bb48c5b2565e10ceef69cfe5afff2 /ACE/ace/Task.cpp | |
| parent | 6f8f4ebd99e45fe3e24a40c6cc7cf03bf8d31c24 (diff) | |
| download | ATCD-1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5.tar.gz | |
Merged RemedyWork branch.
ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'ACE/ace/Task.cpp')
| -rw-r--r-- | ACE/ace/Task.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp index 0a7fa3c8aa0..3008b782206 100644 --- a/ACE/ace/Task.cpp +++ b/ACE/ace/Task.cpp @@ -15,13 +15,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man) thr_mgr_ (thr_man), flags_ (0), grp_id_ (-1) -#if !(defined (ACE_MVS) || defined(__TANDEM)) +#if !defined(ACE_TANDEM_T1248_PTHREADS) ,last_thread_id_ (0) -#endif /* !defined (ACE_MVS) */ +#endif /* !defined (ACE_TANDEM_T1248_PTHREADS) */ { -#if (defined (ACE_MVS) || defined(__TANDEM)) +#if defined(ACE_TANDEM_T1248_PTHREADS) ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ )); -#endif /* defined (ACE_MVS) */ +#endif /* defined (ACE_TANDEM_T1248_PTHREADS) */ } ACE_Task_Base::~ACE_Task_Base (void) @@ -195,11 +195,11 @@ ACE_Task_Base::activate (long flags, if (this->grp_id_ == -1) this->grp_id_ = grp_spawned; -#if defined (ACE_MVS) || defined(__TANDEM) +#if defined(ACE_TANDEM_T1248_PTHREADS) ACE_OS::memcpy( &this->last_thread_id_, '\0', sizeof(this->last_thread_id_)); #else this->last_thread_id_ = 0; // Reset to prevent inadvertant match on ID -#endif /* defined (ACE_MVS) */ +#endif /* defined (ACE_TANDEM_T1248_PTHREADS) */ return 0; |