diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-22 02:22:42 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-22 02:22:42 +0000 |
| commit | a4d943d683b0b1d6ba73b32d37093d7fb130b052 (patch) | |
| tree | 4fd694a69f3aecf9c199a93425d7de8161dc72f7 | |
| parent | 17db3dd7feeed5750aed3b168a1960f073ddb55b (diff) | |
| download | ATCD-a4d943d683b0b1d6ba73b32d37093d7fb130b052.tar.gz | |
Fri May 21 21:12:37 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 5 | ||||
| -rw-r--r-- | ace/Map_Manager.i | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index b0b6d4dc83b..9de2f3ad6c3 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,8 @@ +Fri May 21 21:12:37 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Map_Manager.i (operator==): Since <map_man_> is a pointer + now, we must compare by value, rather than by address. + Fri May 21 12:56:38 1999 David L. Levine <levine@cs.wustl.edu> * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: fixed to diff --git a/ace/Map_Manager.i b/ace/Map_Manager.i index e0d48dd8004..ded8b4b0357 100644 --- a/ace/Map_Manager.i +++ b/ace/Map_Manager.i @@ -322,7 +322,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> & ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void) { return *this->map_man_; @@ -331,7 +331,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator== (const ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> &rhs) const { - return (&this->map_man_ == &rhs.map_man_ && + return (this->map_man_ == rhs.map_man_ && this->next_ == rhs.next_); } |