diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-07 14:32:47 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-07 14:32:47 +0000 |
| commit | 7981b75caea40b40eba38024131c3d6ca0b046fc (patch) | |
| tree | 7a9c43bf28817d94fe85da427bcaf6aaaf7f21f1 /libstdc++-v3/config | |
| parent | 4bada8baae819ed236dd3e7db9ea98fad3a4f1f6 (diff) | |
| download | gcc-7981b75caea40b40eba38024131c3d6ca0b046fc.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80477 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config')
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/monetary_members.cc | 12 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/numeric_members.cc | 4 |
2 files changed, 8 insertions, 8 deletions
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') |