diff options
Diffstat (limited to 'libstdc++')
| -rw-r--r-- | libstdc++/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++/cinst.cc | 1 | ||||
| -rw-r--r-- | libstdc++/sinst.cc | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index c9570fefbcf..2cb0d0a9255 100644 --- a/libstdc++/ChangeLog +++ b/libstdc++/ChangeLog @@ -1,3 +1,9 @@ +1998-08-23 Mark Mitchell <mark@markmitchell.com> + + * sinst.cc: Don't explicitly instantiation string_char_traits<char>. + * cinst.cc: Likewiwse, for complex<float>, complex<double>, + complex<long double>. + 1998-08-17 Mark Mitchell <mark@markmitchell.com> * stdexcept: Put things in the std namespace, if appropriate. diff --git a/libstdc++/cinst.cc b/libstdc++/cinst.cc index 010f3cad5e6..983e8a9caa7 100644 --- a/libstdc++/cinst.cc +++ b/libstdc++/cinst.cc @@ -32,7 +32,6 @@ typedef complex<f> c; typedef const c& ccr; #ifdef MAIN -template class complex<f>; template c& __doapl (c*, ccr); template c& __doaml (c*, ccr); template c& __doami (c*, ccr); diff --git a/libstdc++/sinst.cc b/libstdc++/sinst.cc index 79c31a36933..0b3617ece62 100644 --- a/libstdc++/sinst.cc +++ b/libstdc++/sinst.cc @@ -42,8 +42,11 @@ typedef char c; typedef wchar_t c; #endif -#ifdef TRAITS +#if defined(TRAITS) && !defined(C) template class string_char_traits <c>; +#else +/* string_char_traits<char> is already explicitly specialized in + std/straits.h. */ #endif typedef basic_string <c> s; |