merge from gcc
This commit is contained in:
parent
95aa61ce02
commit
8730135a67
2 changed files with 5 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
|||
2003-05-03 Carlo Wood <carlo@alinoe.com>
|
||||
|
||||
* cp-demangle.c: Fix typo in "char_traints" string-literal.
|
||||
|
||||
2003-04-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||
|
||||
* vsnprintf.c (vsnprintf): Don't pad string with extra nulls.
|
||||
|
|
|
@ -3398,7 +3398,7 @@ demangle_substitution (dm, template_p)
|
|||
}
|
||||
else
|
||||
{
|
||||
RETURN_IF_ERROR (result_add (dm, "std::basic_istream<char, std::char_traints<char> >"));
|
||||
RETURN_IF_ERROR (result_add (dm, "std::basic_istream<char, std::char_traits<char> >"));
|
||||
new_last_source_name = "basic_istream";
|
||||
}
|
||||
*template_p = 0;
|
||||
|
|
Loading…
Reference in a new issue