Two minor patches for egcs-19971122

Two minor patches for egcs-19971122

[Greg Galloway]

Here are two very minor patches for egcs-19971122 that I really like to
see in the first release.  The first one should be sent to SGI as well.

Greg
----
Gregory L. Galloway
Research Scientist I

http://eoeml.gtri.gatech.edu/home/gregg/

Mon Nov 24 11:11:32 EST 1997  Gregory L. Galloway (gregg@eoeml.gtri.gatech.edu)

	* stl_hashtable.h (__stl_prime_list): Added "ul" suffix to suppress 
	compiler warnings about integer so large it is unsigned.

*** libstdc++/stl/stl_hashtable.h.orig	Sat Nov 22 09:56:59 1997
--- libstdc++/stl/stl_hashtable.h	Sat Nov 22 09:58:16 1997
***************
*** 142,153 ****
  static const int __stl_num_primes = 28;
  static const unsigned long __stl_prime_list[__stl_num_primes] =
  {
!   53,         97,         193,       389,       769,
!   1543,       3079,       6151,      12289,     24593,
!   49157,      98317,      196613,    393241,    786433,
!   1572869,    3145739,    6291469,   12582917,  25165843,
!   50331653,   100663319,  201326611, 402653189, 805306457, 
!   1610612741, 3221225473, 4294967291
  };
  
  inline unsigned long __stl_next_prime(unsigned long n)
--- 142,153 ----
  static const int __stl_num_primes = 28;
  static const unsigned long __stl_prime_list[__stl_num_primes] =
  {
!   53,         97,           193,         389,       769,
!   1543,       3079,         6151,        12289,     24593,
!   49157,      98317,        196613,      393241,    786433,
!   1572869,    3145739,      6291469,     12582917,  25165843,
!   50331653,   100663319,    201326611,   402653189, 805306457, 
!   1610612741, 3221225473ul, 4294967291ul
  };
  
  inline unsigned long __stl_next_prime(unsigned long n)

Mon Nov 24 11:13:37 EST 1997  Gregory L. Galloway (gregg@eoeml.gtri.gatech.edu)

	* Makefile.in (HEADERS): Modified list of headers to 
	install to include all of SGI STL headers especially hash_set and 
	hash_map, and added ANSI C++ style wrappers for fstream, iomanip, 
	iostream, and strstream.

	* fstream, iomanip, iostream, strstream: New forwarding headers
	added.

*** libstdc++/Makefile.in.orig	Tue Nov  4 15:12:53 1997
--- libstdc++/Makefile.in	Sun Nov 23 17:28:30 1997
***************
*** 23,30 ****
  HEADERS= cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
  	 csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime \
  	 cwchar cwctype string stdexcept \
! 	 algorithm deque list map queue set stack vector utility functional \
! 	 iterator memory numeric
  
  ARLIB   = libstdc++.a
  SHLIB   = libstdc++.so.$(VERSION)
--- 23,31 ----
  HEADERS= cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
  	 csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime \
  	 cwchar cwctype string stdexcept \
! 	 algorithm deque functional hash_map hash_set iterator list map \
! 	 memory numeric pthread_alloc queue rope set slist stack utility \
! 	 vector fstream iomanip iostream strstream
  
  ARLIB   = libstdc++.a
  SHLIB   = libstdc++.so.$(VERSION)
*** libstdc++/fstream.orig	Tue Oct  7 14:06:25 1997
--- libstdc++/fstream	Tue Oct  7 14:07:38 1997
***************
*** 0 ****
--- 1,7 ----
+ // -*- C++ -*- forwarding header.
+ // This file is part of the GNU ANSI C++ Library.
+ 
+ #ifndef __FSTREAM__
+ #define __FSTREAM__
+ #include <fstream.h>
+ #endif
*** libstdc++/iomanip.orig	Tue Oct  7 14:06:41 1997
--- libstdc++/iomanip	Tue Oct  7 14:08:13 1997
***************
*** 0 ****
--- 1,7 ----
+ // -*- C++ -*- forwarding header.
+ // This file is part of the GNU ANSI C++ Library.
+ 
+ #ifndef __IOMANIP__
+ #define __IOMANIP__
+ #include <iomanip.h>
+ #endif
*** libstdc++/iostream.orig	Tue Oct  7 14:06:33 1997
--- libstdc++/iostream	Tue Oct  7 14:08:24 1997
***************
*** 0 ****
--- 1,7 ----
+ // -*- C++ -*- forwarding header.
+ // This file is part of the GNU ANSI C++ Library.
+ 
+ #ifndef __IOSTREAM__
+ #define __IOSTREAM__
+ #include <iostream.h>
+ #endif
*** libstdc++/strstream.orig	Tue Oct  7 14:06:41 1997
--- libstdc++/strstream	Tue Oct  7 14:08:39 1997
***************
*** 0 ****
--- 1,7 ----
+ // -*- C++ -*- forwarding header.
+ // This file is part of the GNU ANSI C++ Library.
+ 
+ #ifndef __STRSTREAM__
+ #define __STRSTREAM__
+ #include <strstream.h>
+ #endif

Re: Two minor patches for egcs-19971122

[Tudor Hulubei]

Hi,

> Here are two very minor patches for egcs-19971122 that I really like to
> see in the first release.  The first one should be sent to SGI as well.

> 	* Makefile.in (HEADERS): Modified list of headers to 
> 	install to include all of SGI STL headers especially hash_set and 
> 	hash_map, and added ANSI C++ style wrappers for fstream, iomanip, 
> 	iostream, and strstream.

> 	* fstream, iomanip, iostream, strstream: New forwarding headers
> 	added.

How about stringstream & sstream?  The C++ 3.0 book seems a little bit 
confusing to me.  At page 119 it says that in order to use
istringstream you have to include <stringstream>.  Later, at page 641,
there is an example where <sstream> is used for the same purpose.
None of these is included with egcs.

Tudor

Re: Two minor patches for egcs-19971122

[Joe Buck]

> How about stringstream & sstream?  The C++ 3.0 book seems a little bit 
> confusing to me.  At page 119 it says that in order to use
> istringstream you have to include <stringstream>.  Later, at page 641,
> there is an example where <sstream> is used for the same purpose.

The correct header name is <sstream> (I guess you are talking about
Stroustrup's new book -- early printings were full of minor errors like
this: to be fair I think it was originally going to be <stringstream>
but the name was shortened).

> None of these is included with egcs.

Yes, I believe that Dietmar Kuehl has donated a version of stringstream;
I don't know its status.