2004-04-16 Paolo Carlini <pcarlini@suse.de>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / config / locale / generic / monetary_members.cc

diff --git a/libstdc++-v3/config/locale/generic/monetary_members.cc b/libstdc++-v3/config/locale/generic/monetary_members.cc
index 957a326..71ad6d2 100644 (file)
--- a/libstdc++-v3/config/locale/generic/monetary_members.cc
+++ b/libstdc++-v3/config/locale/generic/monetary_members.cc
@@ -127,12 +127,9 @@ namespace std
       _M_data->_M_pos_format = money_base::_S_default_pattern;
       _M_data->_M_neg_format = money_base::_S_default_pattern;
 
-      unsigned char uc;
       for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-       {
-         uc = static_cast<unsigned char>(money_base::_S_atoms[__i]);
-         _M_data->_M_atoms[__i] = btowc(uc);
-       }
+       _M_data->_M_atoms[__i] =
+         static_cast<wchar_t>(money_base::_S_atoms[__i]);
     }
 
   template<> 
@@ -158,12 +155,9 @@ namespace std
       _M_data->_M_pos_format = money_base::_S_default_pattern;
       _M_data->_M_neg_format = money_base::_S_default_pattern;
 
-      unsigned char uc;
       for (size_t __i = 0; __i < money_base::_S_end; ++__i)
-       {
-         uc = static_cast<unsigned char>(money_base::_S_atoms[__i]);
-         _M_data->_M_atoms[__i] = btowc(uc);
-       }
+       _M_data->_M_atoms[__i] =
+         static_cast<wchar_t>(money_base::_S_atoms[__i]);
     }
 
   template<>