From 754ac8f7b2d97cbb4adbb355865fd01e69c73a1e Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Wed, 3 May 2000 16:11:03 +0000 Subject: [PATCH] footer.html: Update to see if it takes effect. 2000-05-03 Phil Edwards Felix Natter * docs/footer.html: Update to see if it takes effect. * docs/thanks.html: More people. * docs/17_intro/headers_cc.txt: Copy from testsuite, since that can't be seen from the web pages. Rename for browser-friendliness... * docs/17_intro/howto.html: ...and update here. * docs/17_intro/porting-howto.html: Changes from Felix. * docs/gccrebuild.html: Mention v3->egcs move. * docs/faq/index.html: Ditto. Also misc tweaks and URL updates. * docs/faq/index.txt: Regenerate. Co-Authored-By: Felix Natter From-SVN: r33631 --- libstdc++-v3/ChangeLog | 13 ++ libstdc++-v3/docs/17_intro/headers_cc.txt | 83 ++++++++ libstdc++-v3/docs/17_intro/howto.html | 6 +- libstdc++-v3/docs/17_intro/porting-howto.html | 200 ++++++++++++++---- libstdc++-v3/docs/faq/index.html | 47 ++-- libstdc++-v3/docs/faq/index.txt | 126 +++++------ libstdc++-v3/docs/footer.html | 4 +- libstdc++-v3/docs/gccrebuild.html | 9 +- libstdc++-v3/docs/thanks.html | 18 +- 9 files changed, 344 insertions(+), 162 deletions(-) create mode 100644 libstdc++-v3/docs/17_intro/headers_cc.txt diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 603fdf2555e..00d3c921cb0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2000-05-03 Phil Edwards + Felix Natter + + * docs/footer.html: Update to see if it takes effect. + * docs/thanks.html: More people. + * docs/17_intro/headers_cc.txt: Copy from testsuite, since that can't + be seen from the web pages. Rename for browser-friendliness... + * docs/17_intro/howto.html: ...and update here. + * docs/17_intro/porting-howto.html: Changes from Felix. + * docs/gccrebuild.html: Mention v3->egcs move. + * docs/faq/index.html: Ditto. Also misc tweaks and URL updates. + * docs/faq/index.txt: Regenerate. + 2000-05-01 Benjamin Kosnik * config/cpu/powerpc/bits/atomicity.h (__exchange_and_add): More diff --git a/libstdc++-v3/docs/17_intro/headers_cc.txt b/libstdc++-v3/docs/17_intro/headers_cc.txt new file mode 100644 index 00000000000..d95f17aee68 --- /dev/null +++ b/libstdc++-v3/docs/17_intro/headers_cc.txt @@ -0,0 +1,83 @@ +// 1999-05-12 bkoz + +// Copyright (C) 1999 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 17.4.1.2 Headers + + +// "C++" headers +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// "C" headers +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// "C" headers that might not work if wchar_t support is disabled. +#include +#if _GLIBCPP_USE_WCHAR_T + #include + #include +#endif + +int main() { } diff --git a/libstdc++-v3/docs/17_intro/howto.html b/libstdc++-v3/docs/17_intro/howto.html index 25642b1ba78..e3b9e26a10c 100644 --- a/libstdc++-v3/docs/17_intro/howto.html +++ b/libstdc++-v3/docs/17_intro/howto.html @@ -9,7 +9,7 @@ libstdc++-v3 HOWTO: Chapter 17 - + @@ -46,7 +46,7 @@ available to you, no matter how.

The names of the headers can be easily seen in - this source code, + testsuite/17_intro/headers.cc, which is a small testbed we use to make certain that the headers all compile and run.

@@ -147,7 +147,7 @@ Comments and suggestions are welcome, and may be sent to Phil Edwards or Gabriel Dos Reis. -
$Id: howto.html,v 1.1 2000/04/21 20:33:31 bkoz Exp $ +
$Id: howto.html,v 1.2 2000/04/25 06:39:48 bkoz Exp $

diff --git a/libstdc++-v3/docs/17_intro/porting-howto.html b/libstdc++-v3/docs/17_intro/porting-howto.html index 024aac7e7c9..4d4c254285d 100644 --- a/libstdc++-v3/docs/17_intro/porting-howto.html +++ b/libstdc++-v3/docs/17_intro/porting-howto.html @@ -15,9 +15,18 @@
  • File-flags: ios::nocreate and ios::noreplace
  • The new headers +
  • Iterator-changes +
  • Libc-macros
  • Comments, suggestions, corrections, questions... +

    +In the following, when I say portable, I will refer to "portable among ISO +14882-implementations". On the other hand, if I say "backportable" or +"conservative", I am talking about "compiles with older +libstdc++-implementations". +

    +

    Namespace std::

     @@ -25,29 +34,40 @@ The latest C++-standard (ISO-14882) requires that the standard C++-library is defined in namespace std::. Thus, to use classes from the standard c++ library, you can do one of three things: -
      -
    • wrap your code in namespace std { ... } -=> This is not an option because only symbols from the standard c++-library are -defined in namespace std::. -
    • put a kind of using-declaration in your source -(either using namespace std; or i.e. using std::string;) -=> works well for source-files, but cannot be used in header-files -
    • use a fully qualified name for each libstdc++-symbol -(i.e. std::string, std::cout) -=> can always be used -
    +
      +
    • wrap your code in namespace std { ... } => This is not an + option because only symbols from the standard c++-library are defined in + namespace std::. + +
    • put a kind of using-declaration in your source (either + using namespace std; or i.e. using std::string;) + => works well for source-files, but cannot be used in header-files + +
    • use a fully qualified name for each libstdc++-symbol + (i.e. std::string, std::cout) => can always be used +
    +

    +

    +Because there are many compilers which still use an implementation that +does not have the standard C++-library in namespace std::, some +care is required to support these as well. +

    +

    +Namespace back-portability-issues are generally not a problem with g++, +because versions of g++ that do not have libstdc++ in std:: use +-fno-honor-std (ignore std::, :: = std::) by +default. That is, the responsibility for enabling or disabling +std:: is on the user; the maintainer does not have to care about it. +This probably applies to some other compilers as well.

    -Namespace portability-issues are not a problem with g++, because versions -of g++ that do not have libstdc++ in std:: use -fno-honor-std -(ignore std::, :: = std::) by default. This probably -applies to some other compilers as well. - The following sections list some possible solutions to support compilers that cannot ignore std::.

    +

    Using namespace composition if the project uses a separate namespace

    +

    Gtk-- defines most of its @@ -55,8 +75,7 @@ classes in namespace Gtk::. Thus, it was possible to adapt Gtk-- to namespace std:: by using a C++-feature called namespace composition. This is what happens if you put a using-declaration into a namespace-definition: the imported -symbol(s) gets imported into the currently active namespace(s). This is -what it looks like in Gtk--: +symbol(s) gets imported into the currently active namespace(s). For example: 

     namespace Gtk {
 	using std::string;
@@ -64,16 +83,23 @@ namespace Gtk {
 }
    In this example, std::string gets imported into namespace Gtk::. -The result is that you don't have to use std::string in this header, -but still std::string does not get imported into user-space (the -global namespace ::) unless the user does using namespace Gtk; -(which is not recommended practice for Gtk--, so it is not a problem). +The result is that you don't have to use std::string in this +header, but still std::string does not get imported into +user-space (the global namespace ::) unless the user does using +namespace Gtk; (which is not recommended practice for Gtk--, so it is +not a problem). Additionally, the using-declarations are wrapped +in macros that are set based on autoconf-tests to either "" or +i.e. using std::string; (depending on whether the system has +libstdc++ in std:: or not). +(ideas from llewelly@dbritsch.dsl.xmission.com, +Karl Nelson )

    -

    Defining an empty namespace std for backwards-compatibility

    +

    Defining an empty namespace std

    -By defining an (empty) namespace std:: before using it, you can avoid -getting errors on systems where no part of the library is in std: +By defining an (empty) namespace std:: before using it, you can +avoid getting errors on systems where no part of the library is in +namespace std: 

     namespace std { }
 using namespace std;
@@ -82,12 +108,12 @@ using namespace std;
       
    Avoid to use fully qualified names (i.e. std::string)
    
 	    
    
 If some compilers complain about using std::string;, and if the
-hack for gtk-- mentioned above does not work, then it might be a good idea
+"hack" for gtk-- mentioned above does not work, then it might be a good idea
 to define a macro NS_STD, which is defined to either "" or "std"
 based on an autoconf-test. Then you should be able to use
 NS_STD::string, which will evaluate to ::string ("string
 in the global namespace") on systems that do not put string in std::.
-(This is untested and might not even be necessary)
+(This is untested)
 
    
 
       
    How some open-source-projects deal with this
    
@@ -103,7 +129,7 @@ in the global namespace") on systems that do not put string in std::.
   mnemonic none
   
   libsigc++
-      portable-impl
+      conservative-impl
   
 
 
@@ -117,11 +143,14 @@ in the global namespace") on systems that do not put string in std::.
     none no namespace std at all
   
   
-    portable-impl wrap all namespace-handling in macros to support
-	compilers without namespace-support (no libstdc++ used in headers)
+    conservative-impl wrap all namespace-handling in macros to
+	support compilers without namespace-support (no libstdc++ used in
+	headers)
   
 
-	
+As you can see, this currently lacks an example of a project which uses
+libstdc++-symbols in headers in a back-portable way
+(except for the Gtk-- "hack").
 
    
         
     
    there is no ios::nocreate/ios::noreplace in ISO 14882
    
@@ -136,7 +165,8 @@ input-streams.
 For output streams, "nocreate" is probably the default, unless you specify
 std::ios::trunc ? To be safe, you can open the file for
 reading, check if it has been opened, and then decide whether you want to
-create/replace or not.
+create/replace or not. To my knowledge, even older implementations support
+app, ate and trunc (except for app ?).
 
    
             
 	
    stream::attach(int fd) is not in the standard any more
    
@@ -166,32 +196,108 @@ headers and tell users of old compilers that they should create links
 (which is what they will have to do sometime anyway).
 
    
 
-	  
    <ctype.h> introduces ambiguity when used with
-	  <cctype>
    
-	  
    
-The best solution I came up with so far is to include cctype
-instead of ctype.h wherever possible, and then use fully
-qualified names to refer to the libstdc++-versions: std::islower,
-std::isalnum etc.  (you will need to as soon as any header includes
-<ctype.h>, because then there will be an ambiguity with the
-C-versions in the global namespace defined in <ctype.h>)
+      
+      
    New headers replacing C-headers
    
+	  
+	    
    
+You should not use the C-headers (except for system-level headers) from C++
+programs. Instead, you should use a set of headers that are named by
+prepending 'c' and, as usual, ommiting the extension (.h). For example,
+instead of using <math.h>, you should use
+<cmath>. The standard specifies that if you include the
+C-style header (<math.h> in this case), the symbols will be
+available both in the global namespace and in namespace std::
+(libstdc++-v3, version 2.90.8 currently puts them in std:: only)
+On the other hand, if you include only the new header
+(i.e. <cmath>), the symbols will only be defined in
+namespace std:: (and macros will be converted to
+inline-functions).
 
    
-
+        
    
+For more information on this, and for information on how the GNU C++
+implementation reuses ("shadows") the C library-functions, have
+a look at www.cantrip.org.
+
    
+	  
       
    <fstream> does not define std::cout,
       std::cin etc.
    
         
    
 In previous versions of the standard, <fstream.h>,
 <ostream.h> and <istream.h> used to define
-cout, cin and so on. With libstdc++-v3, you need
-to include <iostream> to define these.
+cout, cin and so on. Because of the templatized iostreams
+in libstdc++-v3, you need to include <iostream> explicitly
+to define these.
+
    
+
+    
+	
    Iterators
    
+	    
+      
    
+The following are not proper uses of iterators, but may be working fixes
+for existing uses of iterators.
+  
      
+    
    • you cannot do ostream::operator<<(iterator) to print the
+    address of the iterator => use << &*iterator instead ?
+    
    • you cannot clear an iterator's reference (iterator = 0)
+	=> use iterator = iterator_type(); ?
+	
    • if (iterator) won't work any more
+	=> use if (iterator != iterator_type()) ?
+  
    
 
    
+
+    
+	
    Libc-macros (i.e. isspace from <cctype>)
    
+	    
+	  
    
+Glibc 2.0.x and 2.1.x define the <ctype.h>-functionality
+as macros (isspace, isalpha etc.). Libstdc++-v3 "shadows" these macros
+as described in the section on C-headers.
+
    
+      
    
+Older implementations of libstdc++ (g++-2 for egcs 1.x and g++-3 for
+gcc 2.95.2), however, keep these functions as macros, and so it is not
+back-portable to use fully qualified names. For example:
+
    +#include <cctype>
+int main() { std::isspace('X'); }
+
    
+will result in something like this (unless using g++-v3):
+
    +std:: (__ctype_b[(int) ( ( 'X' ) )] & (unsigned short int)   _ISspace )  ;
+
    
+Another problem arises if you put a using namespace std;
+declaration at the top, and include <ctype.h>. This will
+result in ambiguities between the definitions in the global namespace
+(<ctype.h>) and the definitions in namespace std::
+(<cctype>).
+
    
+      
    
+One solution I can think of is to test for -v3 using autoconf-macros, and
+define macros for each of the C-functions (maybe that is possible with one
+"wrapper" macro as well ?).
+
    
+      
    
+Another solution which would fix g++ is to tell the user to modify
+a header-file so that g++-2 (egcs 1.x) and g++-3 (gcc 2.95.2)
+enable a macro which tells <ctype.h> to define functions instead of
+macros:
+
    +// This keeps isanum, et al from being propagated as macros.
+#if __linux__
+#define __NO_CTYPE 1
+#endif
+
+[ now include <ctype.h> ]
+
    
+
    
+
     
 	
    About...
    
 	    
       
    
-Please send any experience, additions, corrections or questions to fnatter@gmx.net or for discussion to
-the libstdc++-v3-mailing-list.
+Please send any experience, additions, corrections or questions to fnatter@gmx.net or for discussion to the
+libstdc++-v3-mailing-list.
 
    
 	
   
diff --git a/libstdc++-v3/docs/faq/index.html b/libstdc++-v3/docs/faq/index.html
index 12c7b3d0546..e516fe15ea4 100644
--- a/libstdc++-v3/docs/faq/index.html
+++ b/libstdc++-v3/docs/faq/index.html
@@ -13,7 +13,7 @@
   ** Locations of "the most recent snapshot is the Nth" text are 
   ** answers 1_1, 1_4, 4_1, 5_6.
 -->
-
+
 
 
 
@@ -106,7 +106,7 @@ HREF="ftp://sourceware.cygnus.com/pub/libstdc++/libstdc++-2.90.8.tar.gz">the
 
 
    
    
    1.2 Why should I use libstdc++?
    
-      
    The recent completion of the ISO C++ standardization gave the
+      
    The completion of the ISO C++ standardization gave the
          C++ community a powerful set of reuseable tools in the form
          of the C++ Standard Library.  However, all existing C++
          implementations are (as the Draft Standard used to say)
@@ -117,10 +117,10 @@ HREF="ftp://sourceware.cygnus.com/pub/libstdc++/libstdc++-2.90.8.tar.gz">the
          (gcc, g++, etc) is widely considered to be
          one of the leading compilers in the world.  Its development
          has recently been taken over by the 
-         GCC team.  All of
+         GCC team.  All of
          the rapid development and near-legendary
      portability
+HREF="http://gcc.gnu.org/gcc-2.95/buildstat.html">portability
          that are the hallmarks of an open-source project are being
          applied to libstdc++.
       
    
@@ -214,7 +214,7 @@ HREF="ftp://sourceware.cygnus.com/pub/libstdc++/libstdc++-2.90.8.tar.gz">
          stuff" classes will probably migrate there.)
       
    
       
    For the bold and/or desperate, the
-         GCC FAQ
+         GCC FAQ
          describes where to find the last libg++ source.
       
    
 
@@ -271,32 +271,13 @@ HREF="http://sourceware.cygnus.com/automake/">automake.
       
    Yes, as of 2.90.8, it is intended as such.
    
       
    The installation instructions cover this in more detail, but
          replacing the older library requires rebuilding some of the
-         code that comes with g++.  If you do not want to do that,
-         then you'll be missing out on a lot of functionality, but it
-         can still be done.
-      
    
-      
    In that case, you can use the same procedure that used to be
-         required:
-         
      
-            
    1.  Build GCC as usual.
-            
    2.  Build libstdc++-v3 as described in the installation
-                 document, under the section "without GCC
-                 sources."  Be aware that you will lose the std::
-                 namespace encapsulation.
-            
    3.  Build your code using -I and -L options so that GCC
-                 finds the libstdc++-v3 headers and library before the
-                 older headers in the GCC include tree.
-         
    
-      
    
-      
    If you configured libstdc++-v3 to install under a directory
-         called /lib3, for example, the command line would look
-         something like
-         
-         
    -      g++ -Wall -I/lib3/include/g++-v3 -L/lib3/lib foo.cc -o foo
-         
    
-         More information (such as using SGI or GNU extensions, and
-         setting the runtime library path) can be found in the RELEASE-NOTES.
+         code that comes with g++.  You will need sources for the 2.95.2
+         compiler in order to build this snapshot.  Building the library
+         on its own and then using -I/-L will no longer work.
+      
    
+      
    After the 2.90.8 snapshot, the library sources were integrated
+         into the compiler sources.  Future releases of the compiler will
+         ship with libstdc++-v3.
       
    
 
 
    
@@ -511,7 +492,7 @@ to the list, Nathan Myers announced that he has started a list of
    
    4.5 Aw, that's easy to fix!
    
       
    If you have found a bug in the library and you think you have
          a working fix, then send it in!  The main GCC site has a page
-         on submitting
+         on submitting
          patches that covers the procedure, but for libstdc++ you
          should of course send the patch to our mailing list, not the
          GCC mailing list.  The libstdc++
@@ -664,7 +645,7 @@ HREF="http://sourceware.cygnus.com/ml/libstdc++/1999/msg00084.html">speculation<
 Comments and suggestions are welcome, and may be sent to
 Phil Edwards or
 Gabriel Dos Reis.
-
     $Id: index.html,v 1.21 2000/03/26 03:44:35 pme Exp $
+
     $Id: index.html,v 1.1 2000/04/21 20:33:32 bkoz Exp $
 
    
 
 
diff --git a/libstdc++-v3/docs/faq/index.txt b/libstdc++-v3/docs/faq/index.txt
index 27c2472b897..d3d20370e30 100644
--- a/libstdc++-v3/docs/faq/index.txt
+++ b/libstdc++-v3/docs/faq/index.txt
@@ -65,11 +65,11 @@
    
 1.2 Why should I use libstdc++?
 
-   The recent completion of the ISO C++ standardization gave the C++
-   community a powerful set of reuseable tools in the form of the C++
-   Standard Library. However, all existing C++ implementations are (as
-   the Draft Standard used to say) "incomplet and incorrekt," and many
-   suffer from limitations of the compilers that use them.
+   The completion of the ISO C++ standardization gave the C++ community a
+   powerful set of reuseable tools in the form of the C++ Standard
+   Library. However, all existing C++ implementations are (as the Draft
+   Standard used to say) "incomplet and incorrekt," and many suffer from
+   limitations of the compilers that use them.
    
    The GNU C/C++/FORTRAN/ compiler (gcc, g++, etc) is
    widely considered to be one of the leading compilers in the world. Its
@@ -206,25 +206,13 @@
    
    The installation instructions cover this in more detail, but replacing
    the older library requires rebuilding some of the code that comes with
-   g++. If you do not want to do that, then you'll be missing out on a
-   lot of functionality, but it can still be done.
-   
-   In that case, you can use the same procedure that used to be required:
-    1. Build GCC as usual.
-    2. Build libstdc++-v3 as described in the installation document,
-       under the section "without GCC sources." Be aware that you will
-       lose the std:: namespace encapsulation.
-    3. Build your code using -I and -L options so that GCC finds the
-       libstdc++-v3 headers and library before the older headers in the
-       GCC include tree.
-       
-   If you configured libstdc++-v3 to install under a directory called
-   /lib3, for example, the command line would look something like
-      g++ -Wall -I/lib3/include/g++-v3 -L/lib3/lib foo.cc -o foo
-
-
-   More information (such as using SGI or GNU extensions, and setting the
-   runtime library path) can be found in the RELEASE-NOTES.
+   g++. You will need sources for the 2.95.2 compiler in order to build
+   this snapshot. Building the library on its own and then using -I/-L
+   will no longer work.
+   
+   After the 2.90.8 snapshot, the library sources were integrated into
+   the compiler sources. Future releases of the compiler will ship with
+   libstdc++-v3.
      _________________________________________________________________
    
 2.3 What is this CVS thing that you keep mentioning?
@@ -533,71 +521,71 @@ count(struct __rb_tree_node_base *, struct __rb_tree_node_base *)'
    
    Comments and suggestions are welcome, and may be sent to [71]Phil
    Edwards or [72]Gabriel Dos Reis.
-   $Id: index.txt,v 1.17 2000/03/26 03:44:35 pme Exp $ 
+   $Id: index.html,v 1.1 2000/04/21 20:33:32 bkoz Exp $ 
 
 References
 
    1. http://sourceware.cygnus.com/libstdc++/
    2. http://sourceware.cygnus.com/libstdc++/faq/index.html
-   3. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/index.html
-   4. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_0
-   5. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_1
-   6. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_2
-   7. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_3
-   8. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_4
-   9. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_5
-  10. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_6
-  11. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_7
-  12. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#1_8
-  13. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#2_0
-  14. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#2_1
-  15. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#2_2
-  16. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#2_3
-  17. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#2_4
-  18. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#3_0
-  19. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#3_1
-  20. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#3_2
-  21. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#4_0
-  22. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#4_1
-  23. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#4_2
-  24. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#4_3
-  25. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#4_4
-  26. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#4_5
-  27. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_0
-  28. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_1
-  29. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_2
-  30. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_3
-  31. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_4
-  32. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_5
-  33. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_6
-  34. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#5_7
+   3. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/index.html
+   4. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_0
+   5. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_1
+   6. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_2
+   7. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_3
+   8. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_4
+   9. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_5
+  10. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_6
+  11. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_7
+  12. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#1_8
+  13. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#2_0
+  14. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#2_1
+  15. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#2_2
+  16. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#2_3
+  17. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#2_4
+  18. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#3_0
+  19. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#3_1
+  20. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#3_2
+  21. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#4_0
+  22. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#4_1
+  23. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#4_2
+  24. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#4_3
+  25. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#4_4
+  26. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#4_5
+  27. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_0
+  28. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_1
+  29. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_2
+  30. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_3
+  31. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_4
+  32. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_5
+  33. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_6
+  34. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#5_7
   35. ftp://sourceware.cygnus.com/pub/libstdc++/libstdc++-2.90.8.tar.gz
-  36. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/17_intro/DESIGN
-  37. http://egcs.cygnus.com/
-  38. http://egcs.cygnus.com/gcc-2.95/buildstat.html
-  39. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/index.html
+  36. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/17_intro/DESIGN
+  37. http://gcc.gnu.org/
+  38. http://gcc.gnu.org/gcc-2.95/buildstat.html
+  39. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/index.html
   40. ftp://sourceware.cygnus.com/pub/libstdc++/libstdc++-2.90.8.tar.gz
-  41. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/index.html
+  41. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/index.html
   42. http://www.deja.com/getdoc.xp?AN=469581698&fmt=text
-  43. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/17_intro/contribute.html
+  43. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/17_intro/contribute.html
   44. http://www.boost.org/
-  45. http://egcs.cygnus.com/faq.html#libg++
+  45. http://gcc.gnu.org/faq.html#libg++
   46. mailto:libstdc++@sourceware.cygnus.com
   47. mailto:pme@sourceware.cygnus.com
   48. mailto:gdr@egcs.cygnus.com
   49. http://sourceware.cygnus.com/autoconf/
   50. http://sourceware.cygnus.com/automake/
-  51. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/documentation.html
-  52. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/17_intro/RELEASE-NOTES
+  51. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/documentation.html
+  52. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/17_intro/RELEASE-NOTES
   53. http://www.gnu.org/software/cvs/cvs.html
   54. http://www.cyclic.com/
   55. http://www.xraylith.wisc.edu/~khan/software/gnu-win32/libstdc++-v3.html
   56. file://localhost/ml/libstdc++/1998/msg00006.html
   57. http://www.cantrip.org/draft-bugs.txt
   58. http://anubis.dkuug.dk/jtc1/sc22/wg21/
-  59. http://egcs.cygnus.com/contribute.html
-  60. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/17_intro/contribute.html
-  61. file://localhost/home0/pedwards/EGCS/gcc-2.95.2/libstdc++-v3/docs/faq/index.html#2_4
+  59. http://gcc.gnu.org/contribute.html
+  60. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/17_intro/contribute.html
+  61. file://localhost/home0/pedwards/src/egcsworking/libstdc++-v3/docs/faq/index.html#2_4
   62. http://sourceware.cygnus.com/ml/libstdc++/1999/msg00080.html
   63. http://sourceware.cygnus.com/ml/libstdc++/1999/msg00084.html
   64. http://www.sgi.com/Technology/STL/
diff --git a/libstdc++-v3/docs/footer.html b/libstdc++-v3/docs/footer.html
index f3740d614e9..a7a2ec0b005 100644
--- a/libstdc++-v3/docs/footer.html
+++ b/libstdc++-v3/docs/footer.html
@@ -9,8 +9,8 @@
 These pages are stoically maintained by 
 Phil Edwards, who might now
 actually be able to maintain them as the directory structure is slowly
-congealing into some kind of permanent structure, and was last modified on
-2000-03-24.
+congealing into some kind of permanent structure, and were last modified on
+2000-04-29.
 
    
 
 
diff --git a/libstdc++-v3/docs/gccrebuild.html b/libstdc++-v3/docs/gccrebuild.html
index 3f167cc0cea..8f57884fb29 100644
--- a/libstdc++-v3/docs/gccrebuild.html
+++ b/libstdc++-v3/docs/gccrebuild.html
@@ -9,7 +9,7 @@
    How to automatically rebuild libgcc.a.
 
 
-
+
 
 
 
@@ -39,7 +39,10 @@
    as objdir; here it will be called GCCobjdir.
 
    
 
-
    This is a kludge, and will go away eventually.
    
+
    This is a kludge, and will go away eventually.  (In a sense, it has
+   already gone away, as the library sources have been merged into the
+   compiler sources.)
+
    
 
 
    
 
@@ -111,7 +114,7 @@
 
 
    
 
    
-$Id: gccrebuild.html,v 1.1 2000/01/14 20:03:09 pme Exp $
+$Id: gccrebuild.html,v 1.1 2000/04/21 20:33:30 bkoz Exp $
 
    
 
 
diff --git a/libstdc++-v3/docs/thanks.html b/libstdc++-v3/docs/thanks.html
index 791272c97ab..02d989c3504 100644
--- a/libstdc++-v3/docs/thanks.html
+++ b/libstdc++-v3/docs/thanks.html
@@ -17,7 +17,7 @@
    Please keep this list in alphabetical order.
 
    
 
      
 
@@ -56,7 +56,8 @@
 
   
    • Benjamin Kosnik for, well, everything.
 
-  
    • Martin v. Loewis for namespace patches and fixes.
+  
    • Martin v. Loewis for namespace patches and fixes, and tons of
+      assistance with the compiler merges.
 
   
    • Philip Martin for lots of string and vector iterator fixes and
       improvements, and string clean up and testsuites.
@@ -71,7 +72,10 @@
   
    • Nathan Myers for inflicting locales on the rest of us, working on
       iostream, string and string documentation (!), fixing that 
       __black_count loop that so many people bugged us about, and creating
-      the initial documentation (DESIGN, CHECKLIST, and so forth).
+      the initial documentation (DESIGN, CHECKLIST, and so forth).  Huge
+      chunks of the MT-safe code are also due to his work.
+
+  
    • Felix Natter for documentation on porting.
 
   
    • Chip Salzenberg for patches and improvements to locales, traits,
       Makefiles, libio, libtool hackery, and "long long" support.
@@ -84,11 +88,15 @@
 
    
 
 
    We'd also like to thank the folks who have contributed time and
-   energy in testing libstdc++-v3:
+   energy in testing libstdc++-v3, especially those sending in testsuite
+   evaluations:
 
 
      
 
-  
    • Folks for sending in testsuite evaluations.
+  
    • Jürgen Freyh
+  
    • llewelly 
+  
    • Loren James Rittle
+  
    • George Talbot
 
 
    
 
-- 
2.30.2