From mboxrd@z Thu Jan  1 00:00:00 1970
From: hjl@lucon.org (H.J. Lu)
To: khan@xraylith.wisc.edu (Mumit Khan)
Cc: egcs@cygnus.com
Subject: Re: (1.0.2) std/bastring.h change -- Why add std/bastring.cc?
Date: Wed, 18 Feb 1998 14:54:00 -0000
Message-id: <m0y5H2p-00058KC@ocean.lucon.org>
References: <9802180511.AA18538@modi.xraylith.wisc.edu>
X-SW-Source: 1998-02/msg00883.html

> 
> Jason Merrill <jason@cygnus.com> writes:
> > 
> > I suppose we should resurrect sinst.h.
> > 
> 
> Please do. I'd rather not see 1.0.2 released with the current scheme.
> I just built a moderately large project hat went up 20% in disk usage 
> and also about ~15% in link time on ELF, and on sparc-sunso4.1.3, the 
> results were much worse both in time and space.
> 

Here is the patch. I have another patch for STL to deal with
thread-safe on glibc 2.


-- 
H.J. Lu (hjl@gnu.org)
----
Wed Feb 18 07:33:14 1998  H.J. Lu  (hjl@gnu.org)

	* std/bastring.h: Don't include <std/bastring.cc>.

	* std/bastring.cc: Include <cstddef> and <std/bastring.h>.

	* sinst.cc: Just include <std/bastring.cc>.

--- ../../../import/egcs/libstdc++/std/bastring.h	Tue Feb 10 08:07:33 1998
+++ std/bastring.h	Wed Feb 18 12:29:55 1998
@@ -607,6 +607,4 @@
 
 } // extern "C++"
 
-#include <std/bastring.cc>
-
 #endif
--- ../../../import/egcs/libstdc++/std/bastring.cc	Tue Feb 10 08:07:32 1998
+++ std/bastring.cc	Wed Feb 18 12:29:55 1998
@@ -25,6 +25,9 @@
 // Written by Jason Merrill based upon the specification by Takanori Adachi
 // in ANSI X3J16/94-0013R2.
 
+#include <cstddef>
+#include <std/bastring.h>
+
 extern "C++" {
 template <class charT, class traits, class Allocator>
 inline void * basic_string <charT, traits, Allocator>::Rep::
--- ../../../import/egcs/libstdc++/sinst.cc	Tue Feb 10 08:07:30 1998
+++ sinst.cc	Wed Feb 18 12:29:55 1998
@@ -33,7 +33,7 @@
 #endif
 #endif
 
-#include <string>
+#include <std/bastring.cc>
 
 #ifdef C
 typedef char c;