summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/bits
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2006-10-14 10:25:35 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2006-10-14 10:25:35 +0000
commit4fb1953207c64de93583e332e0af475bfdb46b98 (patch)
tree0ba3394e251b0d22898853dfd6d65d16551152dc /libstdc++-v3/include/bits
parent78a438f161f869b2ac34c9904b0a2a0cad12127c (diff)
downloadgcc-4fb1953207c64de93583e332e0af475bfdb46b98.tar.gz
ostream.tcc (operator<<(basic_ostream<>&, const char*)): Further fix for throwing widen.
2006-10-14 Paolo Carlini <pcarlini@suse.de> * include/bits/ostream.tcc (operator<<(basic_ostream<>&, const char*)): Further fix for throwing widen. From-SVN: r117730
Diffstat (limited to 'libstdc++-v3/include/bits')
-rw-r--r--libstdc++-v3/include/bits/ostream.tcc9
1 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index 125e0fe4cb8..db09d0a99e5 100644
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -325,17 +325,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const size_t __clen = char_traits<char>::length(__s);
_CharT* __ws = 0;
try
- { __ws = new _CharT[__clen]; }
+ {
+ __ws = new _CharT[__clen];
+ for (size_t __i = 0; __i < __clen; ++__i)
+ __ws[__i] = __out.widen(__s[__i]);
+ }
catch(...)
{
+ delete [] __ws;
__out._M_setstate(ios_base::badbit);
return __out;
}
try
{
- for (size_t __i = 0; __i < __clen; ++__i)
- __ws[__i] = __out.widen(__s[__i]);
__out._M_insert(__ws, __clen);
delete [] __ws;
}