diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/monetary_members.cc | 12 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/numeric_members.cc | 4 |
3 files changed, 19 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c552dcb3f7c..59aae7d0881 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2004-04-07 Paolo Carlini <pcarlini@suse.de> + + * config/locale/gnu/monetary_members.cc + (moneypunct<wchar_t>::_M_initialize_moneypunct): Prefer + _NL_MONETARY_DECIMAL_POINT_WC, _NL_MONETARY_THOUSANDS_SEP_WC, + and __MON_GROUPING to _NL_NUMERIC_DECIMAL_POINT_WC, + _NL_NUMERIC_THOUSANDS_SEP_WC, and GROUPING. + * config/locale/gnu/numeric_members.cc + (numpunct<char>::_M_initialize_numpunct): Prefer DECIMAL_POINT + and THOUSANDS_SEP to the deprecated RADIXCHAR and THOUSEP. + 2004-04-06 Benjamin Kosnik <bkoz@redhat.com> Fixups for EDG front end. diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc index 63bcdd82136..38d9c39969b 100644 --- a/libstdc++-v3/config/locale/gnu/monetary_members.cc +++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc @@ -391,12 +391,12 @@ namespace std #endif union __s_and_w { const char *__s; unsigned int __w; } __u; - __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); + __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc); _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w); - __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); + __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc); _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w); - _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc); + _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); @@ -536,12 +536,12 @@ namespace std #endif union __s_and_w { const char *__s; unsigned int __w; } __u; - __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); + __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc); _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w); - __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); + __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc); _M_data->_M_thousands_sep = static_cast<wchar_t>(__u.__w); - _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc); + _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); diff --git a/libstdc++-v3/config/locale/gnu/numeric_members.cc b/libstdc++-v3/config/locale/gnu/numeric_members.cc index e2bb089082b..02b57b4635e 100644 --- a/libstdc++-v3/config/locale/gnu/numeric_members.cc +++ b/libstdc++-v3/config/locale/gnu/numeric_members.cc @@ -64,8 +64,8 @@ namespace std else { // Named locale. - _M_data->_M_decimal_point = *(__nl_langinfo_l(RADIXCHAR, __cloc)); - _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSEP, __cloc)); + _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, __cloc)); + _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, __cloc)); // Check for NULL, which implies no grouping. if (_M_data->_M_thousands_sep == '\0') |