diff options
Diffstat (limited to 'STL')
| -rw-r--r-- | STL/ChangeLog | 7 | ||||
| -rw-r--r-- | STL/tree.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/STL/ChangeLog b/STL/ChangeLog index 7d127b7a51f..557dca8130a 100644 --- a/STL/ChangeLog +++ b/STL/ChangeLog @@ -1,3 +1,10 @@ +Tue Jan 14 15:46:31 1997 David L. Levine <levine@cs.wustl.edu> + + * tree.h (iterator () and const_iterator ()): added cast + of NULL to link_type before assigning it to NIL; + GreenHills 1.8.8 fails to compile without it. + + Tue Dec 10 20:14:56 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> * bstring.h: Fixed string_char_baggage::copy() so that the pointer diff --git a/STL/tree.h b/STL/tree.h index dc91484b535..738223f2fbf 100644 --- a/STL/tree.h +++ b/STL/tree.h @@ -207,7 +207,7 @@ public: /* * Changed by Terris */ - iterator() { NIL = NULL; } + iterator() { NIL = (link_type) NULL; } bool operator==(const iterator& y) const { return node == y.node; } reference operator*() const { return value(node); } iterator& operator++() { @@ -281,7 +281,7 @@ public: /* * Changed by Terris */ - const_iterator() { NIL = NULL; } + const_iterator() { NIL = (link_type) NULL; } /* * Changed by Terris */ |