From e8c5fc66497d5f85ec182e1d9521a473fc7bcc5a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 10 Dec 2003 10:06:19 +0000 Subject: [PATCH] locale_facets.tcc (num_put::do_put(void*)): Remove the try/catch, not necessary. 2003-12-10 Paolo Carlini * include/bits/locale_facets.tcc (num_put::do_put(void*)): Remove the try/catch, not necessary. From-SVN: r74493 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/locale_facets.tcc | 15 ++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bde6cbf..a328388 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2003-12-10 Paolo Carlini + * include/bits/locale_facets.tcc (num_put::do_put(void*)): + Remove the try/catch, not necessary. + +2003-12-10 Paolo Carlini + * testsuite/22_locale/locale/cons/12438.cc: Tweak memory limit and iterations to avoid spurious failures on some 64 bit machines. diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index ae0a4e4..a583e0e 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1061,17 +1061,10 @@ namespace std const ios_base::fmtflags __fmt = ~(ios_base::showpos | ios_base::basefield | ios_base::uppercase | ios_base::internal); __io.flags(__flags & __fmt | (ios_base::hex | ios_base::showbase)); - try - { - __s = _M_insert_int(__s, __io, __fill, - reinterpret_cast(__v)); - __io.flags(__flags); - } - catch (...) - { - __io.flags(__flags); - __throw_exception_again; - } + + __s = _M_insert_int(__s, __io, __fill, + reinterpret_cast(__v)); + __io.flags(__flags); return __s; } -- 2.7.4