2004-06-28 Paolo Carlini <pcarlini@suse.de>

	* config/locale/gnu/monetary_members.cc
	(moneypunct<wchar_t>::_M_initialize_moneypunct): Clean up
	assignments of _M_decimal_point and _M_thousands_sep.

From-SVN: r83767

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ad9c7f5542994afbb0262f11c68513297ac5d238..b8788186da24589d05cf20679d0ba06bb9b445a8 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-28  Paolo Carlini  <pcarlini@suse.de>
+
+       * config/locale/gnu/monetary_members.cc
+       (moneypunct<wchar_t>::_M_initialize_moneypunct): Clean up
+       assignments of _M_decimal_point and _M_thousands_sep.
+
 2004-06-27  Paolo Carlini  <pcarlini@suse.de>
 
        * docs/html/17_intro/contribute.html: Update some links.

diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc
index f1cb25fe58b7b425012c0fac2887cf599f2fb8f7..947876cce457183b5b08b7267ed836710d703f71 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/monetary_members.cc
+++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc
@@ -387,12 +387,12 @@ namespace std
          setlocale(LC_ALL, __name);
 #endif
 
-         union __s_and_w { const char *__s; unsigned int __w; } __u;
+         union { char *__s; wchar_t __w; } __u;
          __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-         _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
+         _M_data->_M_decimal_point = __u.__w;
 
          __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_thousands_sep = __u.__w;
          _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
          _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
 
@@ -529,12 +529,12 @@ namespace std
          setlocale(LC_ALL, __name);
 #endif
 
-         union __s_and_w { const char *__s; unsigned int __w; } __u;
+          union { char *__s; wchar_t __w; } __u;
          __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
-         _M_data->_M_decimal_point = static_cast<wchar_t>(__u.__w);
+         _M_data->_M_decimal_point = __u.__w;
 
          __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_thousands_sep = __u.__w;
          _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
           _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);