diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-06 19:20:57 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-06 19:20:57 +0000 |
| commit | 84e36a20ddf4b6c8b0c76f0ed98cc16c3f5a0acc (patch) | |
| tree | a795b3141cf5eb3cbe7a07e3559600c33015db25 /ace/Thread_Manager.cpp | |
| parent | 826eec3ff95468ce4b0b2178628db94949e930c5 (diff) | |
| download | ATCD-84e36a20ddf4b6c8b0c76f0ed98cc16c3f5a0acc.tar.gz | |
Removed several superfluous parens.
Diffstat (limited to 'ace/Thread_Manager.cpp')
| -rw-r--r-- | ace/Thread_Manager.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 571345fa6bd..1c206487e42 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -137,8 +137,8 @@ ACE_Thread_Descriptor::terminate () if (this->thr_state_ != ACE_THR_JOINING) { - if (ACE_BIT_DISABLED (this->flags_, (THR_DETACHED | THR_DAEMON)) - || (ACE_BIT_ENABLED (this->flags_, THR_JOINABLE))) + if (ACE_BIT_DISABLED (this->flags_, THR_DETACHED | THR_DAEMON) + || ACE_BIT_ENABLED (this->flags_, THR_JOINABLE)) { // Mark thread as terminated. this->thr_state_ = ACE_THR_TERMINATED; @@ -1445,7 +1445,7 @@ ACE_Thread_Manager::join (ACE_thread_t tid, void **status) // If threads are created as THR_DETACHED or THR_DAEMON, we // can't help much. if (ACE_OS::thr_equal (iter.next ()->thr_id_,tid) && - (ACE_BIT_DISABLED (iter.next ()->flags_, (THR_DETACHED | THR_DAEMON)) + (ACE_BIT_DISABLED (iter.next ()->flags_, THR_DETACHED | THR_DAEMON) || ACE_BIT_ENABLED (iter.next ()->flags_, THR_JOINABLE))) { tdb = *iter.next (); @@ -1524,7 +1524,7 @@ ACE_Thread_Manager::wait_grp (int grp_id) // If threads are created as THR_DETACHED or THR_DAEMON, we // can't help much. if (iter.next ()->grp_id_ == grp_id && - (ACE_BIT_DISABLED (iter.next ()->flags_, (THR_DETACHED | THR_DAEMON)) + (ACE_BIT_DISABLED (iter.next ()->flags_, THR_DETACHED | THR_DAEMON) || ACE_BIT_ENABLED (iter.next ()->flags_, THR_JOINABLE))) { iter.next ()->thr_state_ = ACE_THR_JOINING; @@ -1638,8 +1638,8 @@ ACE_Thread_Manager::exit (void *status, int do_thr_exit) // just to be safe, let's put it here. if (td->thr_state != ACE_THR_JOINING) - if (ACE_BIT_DISABLED (td->flags_, (THR_DETACHED | THR_DAEMON)) - || (ACE_BIT_ENABLED (td->flags_, THR_JOINABLE))) + if (ACE_BIT_DISABLED (td->flags_, THR_DETACHED | THR_DAEMON) + || ACE_BIT_ENABLED (td->flags_, THR_JOINABLE)) { // Mark thread as terminated. td->thr_state_ = ACE_THR_TERMINATED; @@ -1724,8 +1724,9 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout, iter (this->thr_list_); !iter.done (); iter.advance ()) - if (ACE_BIT_ENABLED (iter.next ()->flags_, (THR_DETACHED | THR_DAEMON)) && - ACE_BIT_DISABLED (iter.next ()->flags_, THR_JOINABLE)) + if (ACE_BIT_ENABLED (iter.next ()->flags_, + THR_DETACHED | THR_DAEMON) + && ACE_BIT_DISABLED (iter.next ()->flags_, THR_JOINABLE)) { this->thr_to_be_removed_.enqueue_tail (iter.next ()); iter.next ()->thr_state_ = ACE_THR_JOINING; @@ -1761,7 +1762,7 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout, #endif /* CHORUS */ while ((item = this->terminated_thr_list_.delete_head ()) != 0) { - if (ACE_BIT_DISABLED (item->flags_, (THR_DETACHED | THR_DAEMON)) + if (ACE_BIT_DISABLED (item->flags_, THR_DETACHED | THR_DAEMON) || ACE_BIT_ENABLED (item->flags_, THR_JOINABLE)) // Detached handles shouldn't reached here. ACE_Thread::join (item->thr_handle_); |