summaryrefslogtreecommitdiff
path: root/STL
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-01-14 21:54:38 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-01-14 21:54:38 +0000
commit1a376726662286a7621ac6620571437a0cef7cd7 (patch)
tree5ba6c35519c31591248878ae43cff3143b32b6bc /STL
parent9a3ded0e41a7e7abae748f085c56d32417faa996 (diff)
downloadATCD-1a376726662286a7621ac6620571437a0cef7cd7.tar.gz
added cast of NULL to please GreenHills 1.8.8
Diffstat (limited to 'STL')
-rw-r--r--STL/ChangeLog7
-rw-r--r--STL/tree.h4
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
*/