diff options
Diffstat (limited to 'contrib/libstdc++/src/localename.cc')
| -rw-r--r-- | contrib/libstdc++/src/localename.cc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/contrib/libstdc++/src/localename.cc b/contrib/libstdc++/src/localename.cc index 1b40e0c..8fa9118 100644 --- a/contrib/libstdc++/src/localename.cc +++ b/contrib/libstdc++/src/localename.cc @@ -132,8 +132,8 @@ namespace std _M_init_facet(new num_get<char>); _M_init_facet(new num_put<char>); _M_init_facet(new std::collate<char>(__cloc)); - _M_init_facet(new moneypunct<char, false>(__cloc)); - _M_init_facet(new moneypunct<char, true>(__cloc)); + _M_init_facet(new moneypunct<char, false>(__cloc, __s)); + _M_init_facet(new moneypunct<char, true>(__cloc, __s)); _M_init_facet(new money_get<char>); _M_init_facet(new money_put<char>); _M_init_facet(new __timepunct<char>(__cloc, __s)); @@ -148,8 +148,8 @@ namespace std _M_init_facet(new num_get<wchar_t>); _M_init_facet(new num_put<wchar_t>); _M_init_facet(new std::collate<wchar_t>(__cloc)); - _M_init_facet(new moneypunct<wchar_t, false>(__cloc)); - _M_init_facet(new moneypunct<wchar_t, true>(__cloc)); + _M_init_facet(new moneypunct<wchar_t, false>(__cloc, __s)); + _M_init_facet(new moneypunct<wchar_t, true>(__cloc, __s)); _M_init_facet(new money_get<wchar_t>); _M_init_facet(new money_put<wchar_t>); _M_init_facet(new __timepunct<wchar_t>(__cloc, __s)); @@ -255,13 +255,7 @@ namespace std facet** __old = _M_facets; facet** __new; const size_t __new_size = __index + 4; - try - { __new = new facet*[__new_size]; } - catch(...) - { - delete [] __new; - __throw_exception_again; - } + __new = new facet*[__new_size]; for (size_t __i = 0; __i < _M_facets_size; ++__i) __new[__i] = _M_facets[__i]; for (size_t __i2 = _M_facets_size; __i2 < __new_size; ++__i2) |
