From 1efef5036a508b34af03e35f18daa811548dd116 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@gnu.org>
Date: Mon, 21 Aug 2000 07:11:38 +0000
Subject: [PATCH] string-inst.cc: Tweak instantiations for new-gxx-abi.

2000-08-20  Benjamin Kosnik  <bkoz@gnu.org>

	* src/string-inst.cc: Tweak instantiations for new-gxx-abi.

From-SVN: r35831
---
 libstdc++-v3/ChangeLog          |  4 +++
 libstdc++-v3/src/string-inst.cc | 44 ++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 438a5926ae2..83b391580bd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-20  Benjamin Kosnik  <bkoz@gnu.org>
+
+	* src/string-inst.cc: Tweak instantiations for new-gxx-abi.
+
 2000-08-19  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* bits/valarray_array.h (__valarray_min, __valarray_max): Fix
diff --git a/libstdc++-v3/src/string-inst.cc b/libstdc++-v3/src/string-inst.cc
index e883ef3ff0c..425413ad561 100644
--- a/libstdc++-v3/src/string-inst.cc
+++ b/libstdc++-v3/src/string-inst.cc
@@ -50,45 +50,43 @@ namespace std
   template C S::_Rep::_S_terminal;
   template S::size_type S::_Rep::_S_max_size;
   template S::size_type S::_S_empty_rep_storage[];
-
-  template S::basic_string(S const&);
   template S::_Rep* S::_Rep::_S_create(size_t, S::allocator_type const&);
-  template void S::_Rep::_M_destroy(S::allocator_type const&) throw();
+  template void S::_Rep::_M_destroy(const S::allocator_type&) throw();
   template void __destroy_aux(S*, S*, __false_type);
 
-  template 
-    S::basic_string(S::size_type, C, S::allocator_type const&);
+  template S::basic_string(S const&);
 
   template 
-    S::basic_string(S::allocator_type const&);
+    S::basic_string(S::size_type, C, const S::allocator_type&);
 
   template 
-    S::basic_string(S const&, S::size_type, S::size_type);
+    S::basic_string(const S::allocator_type&);
 
   template 
-    S::basic_string(
-      S const&, S::size_type, S::size_type, S::allocator_type const&);
+    S::basic_string(const S&, S::size_type, S::size_type);
 
   template 
-    S::basic_string(
-      C const*, S::size_type, S::allocator_type const&);
+    S::basic_string(const S&, S::size_type, S::size_type, 
+		    const S::allocator_type&);
 
   template 
-    S::basic_string(
-      C const*, S::allocator_type const&);
+    S::basic_string(C const*, S::size_type, const S::allocator_type&);
 
   template 
-    S::basic_string
-    (C*, C*, const allocator<C>&);
+    S::basic_string(C const*, S::allocator_type const&);
 
   template 
-    S::basic_string
-    (S::iterator, S::iterator, const allocator<C>&);
+    S::basic_string(C*, C*, const allocator<C>&);
+
+  template 
+    S::basic_string(S::iterator, S::iterator, const allocator<C>&);
 
   template
     void S::_M_leak_hard();
+
   template
     void S::_M_mutate(S::size_type, S::size_type, S::size_type);
+
   template
     C* S::_Rep::_M_clone(S::allocator_type const&, S::size_type);
 
@@ -101,6 +99,7 @@ namespace std
 # ifdef _GLIBCPP_ALLOC_CONTROL
     template
       bool (* S::_Rep::_S_excess_slop)(size_t, size_t); 
+
     template
       bool S::_Rep::_S_default_excess(size_t, size_t); 
 # endif
@@ -122,8 +121,7 @@ namespace std
 
   template 
     S& 
-    S::append<S::iterator>
-    (S::iterator, S::iterator);
+    S::append<S::iterator>(S::iterator, S::iterator);
 
   template
     S& 
@@ -131,8 +129,7 @@ namespace std
 
   template 
     S& 
-    S::assign<S::iterator>
-    (S::iterator, S::iterator);
+    S::assign<S::iterator>(S::iterator, S::iterator);
 
   template 
     void
@@ -140,8 +137,8 @@ namespace std
     (S::iterator, S::iterator, S::iterator); //it, c+, c+ and temptype = char*
 
   template
-    S& S::replace(
-      S::size_type, S::size_type, S const&, S::size_type, S::size_type);
+    S& S::replace(S::size_type, S::size_type, S const&, 
+		  S::size_type, S::size_type);
 
   template 
     S& S::replace(S::iterator, S::iterator, S::size_type, C);
@@ -275,3 +272,4 @@ namespace std
 
 
 
+