summaryrefslogtreecommitdiff
path: root/STL
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1996-12-06 08:11:23 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1996-12-06 08:11:23 +0000
commit136af0eab7bf0571f828bf71622c0a3d5090b0a6 (patch)
tree0d934358d82103775348c2b77380763c684f439a /STL
parentd2e4420a8c0d205673bba5f70cedb3e9dbda88d5 (diff)
downloadATCD-136af0eab7bf0571f828bf71622c0a3d5090b0a6.tar.gz
*** empty log message ***
Diffstat (limited to 'STL')
-rw-r--r--STL/ChangeLog4
-rw-r--r--STL/bool.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/STL/ChangeLog b/STL/ChangeLog
index 76c0ec98a8a..c47b49229a7 100644
--- a/STL/ChangeLog
+++ b/STL/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 6 02:08:35 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu>
+
+ * bool.h: Made the defines for bool, true, and false conditional.
+
Wed Dec 4 00:17:11 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu>
* vector.h: Modified to remove the default argument to the
diff --git a/STL/bool.h b/STL/bool.h
index dd73435e51e..6478add649a 100644
--- a/STL/bool.h
+++ b/STL/bool.h
@@ -23,9 +23,17 @@ namespace std {
*
*/
+#if !defined (bool)
#define bool int
+#endif /* bool */
+
+#if !defined (true)
#define true 1
+#endif /* true */
+
+#if !defined (false)
#define false 0
+#endif /* false */
/*
*Added by d:\\convert.pl --begin--