diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-17 14:06:59 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-17 14:06:59 +0000 |
| commit | b6a464a7670fb2e10089b4b7178f1824cff30c0a (patch) | |
| tree | 669db88fde68af11eb6cc5a7669cbeedc7d62e43 /TAO | |
| parent | 0e946d0e193e2c7bb503f99835149c746a05feed (diff) | |
| download | ATCD-b6a464a7670fb2e10089b4b7178f1824cff30c0a.tar.gz | |
ChangeLogTag:Thu Sep 17 09:04:34 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 9fe2ae52cab..74e09674f85 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Thu Sep 17 09:04:34 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB_Core.cpp: + More fixes for HP-UX 10.2, we have to use ACE_OS::thr_equal() + instead of operator==, thanks to Anne Blankert <anne@geodan.nl> + for pointing out this problems. + Wed Sep 16 22:36:55 1998 David L. Levine <levine@cs.wustl.edu> * orbsvcs/tests/EC_Mcast/EC_Mcast.i diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index c7faca3a255..9ef5d17e32d 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -995,9 +995,9 @@ TAO_ORB_Core::I_am_the_leader_thread (void) { TAO_Leader_Follower_Info &lf_info = this->orb ()->leader_follower_info (); if (lf_info.leaders_) - return (lf_info.leader_thread_ID_ == ACE_Thread::self ()); - else - return 0; + return ACE_OS::thr_equal (lf_info.leader_thread_ID_, + ACE_Thread::self ()); + return 0; } void @@ -1006,8 +1006,10 @@ TAO_ORB_Core::set_leader_thread (void) // model { TAO_Leader_Follower_Info &lf_info = this->orb ()->leader_follower_info (); - ACE_ASSERT ((lf_info.leaders_ >= 1 && lf_info.leader_thread_ID_ == ACE_Thread::self ()) - || lf_info.leaders_ == 0); + ACE_ASSERT ((lf_info.leaders_ >= 1 + && ACE_OS::thr_equal (lf_info.leader_thread_ID_, + ACE_Thread::self ())) + || lf_info.leaders_ == 0); lf_info.leaders_++; lf_info.leader_thread_ID_ = ACE_Thread::self (); } @@ -1038,7 +1040,9 @@ TAO_ORB_Core::unset_leader_thread (void) // sets the flag in the leader-follower model to false { TAO_Leader_Follower_Info &lf_info = this->orb ()->leader_follower_info (); - ACE_ASSERT ((lf_info.leaders_ > 1 && lf_info.leader_thread_ID_ == ACE_Thread::self ()) + ACE_ASSERT ((lf_info.leaders_ > 1 + && ACE_OS::thr_equal (lf_info.leader_thread_ID_, + ACE_Thread::self ())) || lf_info.leaders_ == 1); lf_info.leaders_--; } |