*** empty log message ***

2 files changed, 15 insertions, 53 deletions

diff --git a/STL/ChangeLog b/STL/ChangeLog
index 902fb94c94c..76c0ec98a8a 100644
--- a/STL/ChangeLog
+++ b/STL/ChangeLog
@@ -1,53 +1,14 @@
-This version of STL was obtained from
-http://www.rahul.net/terris/.  This is a modified version of the
-implementation that comes with VC++4.0.  Please see readme2.stl for
-details. 
+Wed Dec  4 00:17:11 1996  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
 
-The following modification have been made for compilation with VC++4.x
+	* vector.h: Modified to remove the default argument to the
+ 	  constructor.  This avoids the VC++4.0 compiler from failing to
+ 	  deal correctly with nested classes.
+	  
+	* bstring.h: Modified access to reserve and default_size to
+ 	  correctly use the std namespace.
 
-________________________________________
+	* This version of STL was obtained from
+ 	  http://www.rahul.net/terris/.  This is a modified version of the
+ 	  implementation that comes with VC++4.0.  Please see README
+ 	  for details.
 
-vector.h (line 85)
-________________________________________
-
-
-    /*
-     *  This is cause the VC++ compiler sucks
-     *  and does not recognize nested classes properly
-     *       
-     */
-#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
-    vector(size_type n, const T& value = T()) {
-	start = static_allocator.allocate(n);
-	uninitialized_fill_n(start, n, value);
-	finish = start + n;
-	end_of_storage = finish;
-    }
-#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */
-
-
-________________________________________
-
-bstring.h (line 1102)
-________________________________________
-
-
-    /* 
-     * This should be correctly scoped
-     *
-     * if (cap == ::reserve)
-     */
-
-    if (cap == std::reserve)
-    {
-       len = 0;
-       res = size;
-       ptr = new charT [res];
-    }
-    /* 
-     * This should be correctly scoped
-     *
-     *     else if ((cap == ::default_size) && (size != NPOS))
-     */
-
-    else if ((cap == std::default_size) && (size != NPOS))
diff --git a/STL/vector.h b/STL/vector.h
index 66973a70333..7e2f11448b2 100644
--- a/STL/vector.h
+++ b/STL/vector.h
@@ -85,16 +85,17 @@ public:
     /*
      *  This is cause the VC++ compiler sucks
      *  and does not recognize nested classes properly
+     *
+     *  Here is the original:
+     *  vector(size_type n, const T& value = T()) {
      *       
      */
-#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
-    vector(size_type n, const T& value = T()) {
+    vector(size_type n, const T& value /* = T() */) {
 	start = static_allocator.allocate(n);
 	uninitialized_fill_n(start, n, value);
 	finish = start + n;
 	end_of_storage = finish;
     }
-#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */
     vector(const vector<T>& x) {
 	start = static_allocator.allocate(x.end() - x.begin());
 	finish = uninitialized_copy(x.begin(), x.end(), start);