diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2003-12-10 10:06:19 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-12-10 10:06:19 +0000 |
| commit | e8c5fc66497d5f85ec182e1d9521a473fc7bcc5a (patch) | |
| tree | 6e0ba84da1230b3c7bb9cf44dde309df5a749bd1 | |
| parent | 628b26f8b22a3ce5f28c4ea810a4d88780f7a63b (diff) | |
| download | gcc-e8c5fc66497d5f85ec182e1d9521a473fc7bcc5a.zip gcc-e8c5fc66497d5f85ec182e1d9521a473fc7bcc5a.tar.gz gcc-e8c5fc66497d5f85ec182e1d9521a473fc7bcc5a.tar.bz2 | |
locale_facets.tcc (num_put::do_put(void*)): Remove the try/catch, not necessary.
2003-12-10 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (num_put::do_put(void*)):
Remove the try/catch, not necessary.
From-SVN: r74493
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <pcarlini@suse.de> + * include/bits/locale_facets.tcc (num_put::do_put(void*)): + Remove the try/catch, not necessary. + +2003-12-10 Paolo Carlini <pcarlini@suse.de> + * 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<unsigned long>(__v)); - __io.flags(__flags); - } - catch (...) - { - __io.flags(__flags); - __throw_exception_again; - } + + __s = _M_insert_int(__s, __io, __fill, + reinterpret_cast<unsigned long>(__v)); + __io.flags(__flags); return __s; } |