diff options
| author | DJ Delorie <dj@redhat.com> | 2003-05-03 17:14:52 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2003-05-03 17:14:52 +0000 |
| commit | 8730135a67d09670464c8f7d0347e4e221289505 (patch) | |
| tree | 8f1e5455591ae6f693eb05eeda1abba0cae3988c /libiberty | |
| parent | 95aa61ce02e1cec65b0b3fd2982aa73f67e5d601 (diff) | |
| download | gdb-8730135a67d09670464c8f7d0347e4e221289505.zip gdb-8730135a67d09670464c8f7d0347e4e221289505.tar.gz gdb-8730135a67d09670464c8f7d0347e4e221289505.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index ae5a7c5..5beb09b 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -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. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 9adf5fd..5dcce55 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -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; |