ios.cc (ios_base::_M_grow_words(int ix)): Fix libstdc++/1089.

2000-12-19  Curtis Janssen  <cljanss@ca.sandia.gov>

	* src/ios.cc (ios_base::_M_grow_words(int ix)): Fix libstdc++/1089.
	* testsuite/27_io/ios_base_storage.cc (test01): New file.

From-SVN: r38391

libstdc++-v3/ChangeLog

+2000-12-19  Curtis Janssen  <cljanss@ca.sandia.gov>
+
+	* src/ios.cc (ios_base::_M_grow_words(int ix)): Fix libstdc++/1089.
+	* testsuite/27_io/ios_base_storage.cc (test01): New file.
+
 2000-12-19  Benjamin Kosnik  <bkoz@fillmore.constant.com>
 
 	* configure.in: Don't turn on long long by default.
+	(gxx_target_include_dir): Adjuse comment.
 	* configure: Regenerate.
 	* include/c/bits/std_cstdio.h: Remove c++config.h include.
 	* src/locale.cc: Formatting tweaks.

libstdc++-v3/configure

@@ -19819,6 +19819,7 @@ fi
 # specified as build_headers in src/Makefile.am in a target-dependent
 # place, or else multiple installs for different compilers will
 # overwrite these files.
+# NB: Keep this and gcc/Makefile.in's -DGPLUSPLUS_TOOL_INCLUDE_DIR in sync.
 gxx_target_include_dir='$(exec_prefix)/$(target_alias)/include/g++-$(libstdcxx_interface)'
 
 

libstdc++-v3/configure.in

@@ -279,6 +279,7 @@ fi
 # specified as build_headers in src/Makefile.am in a target-dependent
 # place, or else multiple installs for different compilers will
 # overwrite these files.
+# NB: Keep this and gcc/Makefile.in's -DGPLUSPLUS_TOOL_INCLUDE_DIR in sync.
 gxx_target_include_dir='$(exec_prefix)/$(target_alias)/include/g++-$(libstdcxx_interface)'
 AC_SUBST(gxx_target_include_dir)
 

libstdc++-v3/src/ios.cc

@@ -220,8 +220,10 @@ namespace std {
 	    // _M_clear(_M_rdstate() | badbit);  // may throw
 	    return _M_dummy;
 	  }
-	do { words[i] = _M_words[i]; } while (++i < _M_word_limit);
-	if (_M_words != _M_word_array) delete [] _M_words;
+	for (; i < _M_word_limit; i++) 
+	  words[i] = _M_words[i];
+	if (_M_words != _M_word_array) 
+	  delete [] _M_words;
       }
     
     do { words[i] = zero; } while (++i < newlimit);