diff options
| -rw-r--r-- | ChangeLog-98a | 8 | ||||
| -rw-r--r-- | ace/Containers.cpp | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index 3d58766563e..679e355c24a 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,8 +1,14 @@ +Wed Feb 04 11:07:46 1998 Chris Gill <cdgill@cs.wustl.edu> + + * ace/Containers.cpp : fixed my "fix" to new_position pointer in + ACE_Ordered_MultiSet<T>::find_from () - now checks the pointer + before assigning something to it. + Tue Feb 03 15:11:00 1998 Chris Gill <cdgill@cs.wustl.edu> * ace/Containers.cpp : fixed order of member initialization list in ACE_DNode ctor, added update of new_position pointer in - ACE_Ordered_MultiSet::find_from () + ACE_Ordered_MultiSet<T>::find_from () Mon Feb 02 21:26:30 1998 David L. Levine <levine@cs.wustl.edu> diff --git a/ace/Containers.cpp b/ace/Containers.cpp index 0ecd08ddb5d..a74c93fe897 100644 --- a/ace/Containers.cpp +++ b/ace/Containers.cpp @@ -1955,7 +1955,11 @@ ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position, } this->cur_size_++; - *new_position = temp; + if (new_position) + { + *new_position = temp; + } + return 0; } |