Commit f942e78d by Andreas Schwab Committed by Andreas Schwab

monetary_members.cc: Restore locale before rethrowing exception.

* config/locale/gnu/monetary_members.cc: Restore locale before
rethrowing exception.

From-SVN: r76595
parent bbcd2439
2004-01-26 Andreas Schwab <schwab@suse.de>
* config/locale/gnu/monetary_members.cc: Restore locale before
rethrowing exception.
2004-01-25 Paolo Carlini <pcarlini@suse.de> 2004-01-25 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h (_M_replace_aux, _M_replace_safe): * include/bits/basic_string.h (_M_replace_aux, _M_replace_safe):
......
// std::moneypunct implementation details, GNU version -*- C++ -*- // std::moneypunct implementation details, GNU version -*- C++ -*-
// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -419,6 +419,12 @@ namespace std ...@@ -419,6 +419,12 @@ namespace std
_M_data = 0; _M_data = 0;
delete __wcs_ps; delete __wcs_ps;
delete __wcs_ns; delete __wcs_ns;
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#else
setlocale(LC_ALL, __old);
free(__old);
#endif
__throw_exception_again; __throw_exception_again;
} }
...@@ -543,6 +549,12 @@ namespace std ...@@ -543,6 +549,12 @@ namespace std
_M_data = 0; _M_data = 0;
delete __wcs_ps; delete __wcs_ps;
delete __wcs_ns; delete __wcs_ns;
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#else
setlocale(LC_ALL, __old);
free(__old);
#endif
__throw_exception_again; __throw_exception_again;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment