diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d43172a75ba9..88156764a829 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2012-03-09 Andreas Schwab + + * config/locale/gnu/monetary_members.cc + (moneypunct::_M_initialize_moneypunct): Throw caught + exception again. + (moneypunct::_M_initialize_moneypunct): Likewise. + * testsuite/22_locale/locale/cons/12352.cc: Also test en_US + locale. + 2012-03-09 Paolo Carlini * include/debug/formatter.h (enum _Debug_msg_id): Add diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc index 214c4af7d768..d1d9939764db 100644 --- a/libstdc++-v3/config/locale/gnu/monetary_members.cc +++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc @@ -1,6 +1,6 @@ // std::moneypunct implementation details, GNU version -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -339,6 +339,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete [] __group; delete [] __ps; delete [] __ns; + __throw_exception_again; } char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); @@ -489,6 +490,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete [] __group; delete [] __ps; delete [] __ns; + __throw_exception_again; } char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc index f56bf6786589..0449bf30e4b1 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc @@ -1,4 +1,5 @@ // { dg-require-namedlocale "" } +// { dg-require-namedlocale "en_US" } // Copyright (C) 2003, 2005, 2009 Free Software Foundation // @@ -105,6 +106,9 @@ void test01(int iters) std::locale loc1 = std::locale(""); std::locale loc2(loc1, std::locale::classic(), std::locale::numeric); + std::locale loc3 = std::locale("en_US"); + std::locale loc4(loc3, std::locale::classic(), + std::locale::numeric); } catch (std::exception&) {