aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gcc.gnu.org>1998-11-23 09:21:12 +0000
committerUlrich Drepper <drepper@gcc.gnu.org>1998-11-23 09:21:12 +0000
commitc5670ac6faeacf3986abd21634071aa3cd9d8435 (patch)
tree7e13fa5358d5741d10e8601b8f60503f000af52e
parent9855b854a4009b4327e16df8a2cdde69f2b05ba2 (diff)
downloadgcc-c5670ac6faeacf3986abd21634071aa3cd9d8435.zip
gcc-c5670ac6faeacf3986abd21634071aa3cd9d8435.tar.gz
gcc-c5670ac6faeacf3986abd21634071aa3cd9d8435.tar.bz2
(operator>>): Cast new character to char before adding to string.
(getline): Likewise. From-SVN: r23786
-rw-r--r--libstdc++/std/bastring.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++/std/bastring.cc b/libstdc++/std/bastring.cc
index b5f7a0d..4ecef59 100644
--- a/libstdc++/std/bastring.cc
+++ b/libstdc++/std/bastring.cc
@@ -39,7 +39,7 @@ operator delete (void * ptr)
{
Allocator::deallocate(ptr, sizeof(Rep) +
reinterpret_cast<Rep *>(ptr)->res *
- sizeof (charT));
+ sizeof (charT));
}
template <class charT, class traits, class Allocator>
@@ -450,7 +450,7 @@ operator>> (istream &is, basic_string <charT, traits, Allocator> &s)
sb->sungetc ();
break;
}
- s += ch;
+ s += static_cast<char> (ch);
if (--w == 1)
break;
}
@@ -496,7 +496,7 @@ getline (istream &is, basic_string <charT, traits, Allocator>& s, charT delim)
if (ch == delim)
break;
- s += ch;
+ s += static_cast<char> (ch);
if (s.length () == s.npos - 1)
{