diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-24 16:12:52 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-24 16:12:52 +0100 |
| commit | c4275e3632f19d3f908fbe86a5af14b49c727859 (patch) | |
| tree | 64d64fdc719caa34eaa519aec3239a2e480d8738 | |
| parent | 75d423d5b4ce43a9586504b37a6af91bcb5d37ac (diff) | |
| download | ATCD-c4275e3632f19d3f908fbe86a5af14b49c727859.tar.gz | |
Removed checks for ACE_TANDEM_T1248_PTHREADS, not set in any config file
* ACE/ace/Task.cpp:
* ACE/ace/os_include/os_pthread.h:
| -rw-r--r-- | ACE/ace/Task.cpp | 12 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_pthread.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp index ef7e702c089..4596d91088e 100644 --- a/ACE/ace/Task.cpp +++ b/ACE/ace/Task.cpp @@ -14,13 +14,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man) thr_mgr_ (thr_man), flags_ (0), grp_id_ (-1) -#if !(defined (ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT)) +#if !defined (ACE_THREAD_T_IS_A_STRUCT) ,last_thread_id_ (0) -#endif /* ! ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */ +#endif /* !ACE_THREAD_T_IS_A_STRUCT */ { -#if defined (ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT) +#if defined (ACE_THREAD_T_IS_A_STRUCT) ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ )); -#endif /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */ +#endif /* ACE_THREAD_T_IS_A_STRUCT */ } ACE_Task_Base::~ACE_Task_Base () @@ -192,11 +192,11 @@ ACE_Task_Base::activate (long flags, if (this->grp_id_ == -1) this->grp_id_ = grp_spawned; -#if defined(ACE_TANDEM_T1248_PTHREADS) || defined (ACE_THREAD_T_IS_A_STRUCT) +#if defined (ACE_THREAD_T_IS_A_STRUCT) 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 /* ACE_TANDEM_T1248_PTHREADS || ACE_THREAD_T_IS_A_STRUCT */ +#endif /* ACE_THREAD_T_IS_A_STRUCT */ return 0; diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h index 5693cb880e2..50c483ba9d7 100644 --- a/ACE/ace/os_include/os_pthread.h +++ b/ACE/ace/os_include/os_pthread.h @@ -67,7 +67,7 @@ // programs to have their own ACE-wide "default". // PROCESS-level values -# if (defined (_POSIX_PRIORITY_SCHEDULING) || defined (ACE_TANDEM_T1248_PTHREADS)) +# if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) # if defined (HPUX) |