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

	* acconfig.h: Remove _GLIBCXX_USE_LONG_DOUBLE entry, not
	used anymore.
	* config.h.in: Regenerate.

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

	* config/locale/generic/monetary_members.cc
	(moneypunct<wchar_t>::_M_initialize_moneypunct): Avoid calling
	btowc unnecessarily, just cast to wchar_t (the concerned chars
	all belong to the basic character set).
	* config/locale/generic/numeric_members.cc
	(numpunct<wchar_t>::_M_initialize_numpunct): Likewise.
	* config/locale/gnu/monetary_members.cc
	(moneypunct<wchar_t>::_M_initialize_moneypunct): Likewise.
	* config/locale/gnu/numeric_members.cc
	(numpunct<wchar_t>::_M_initialize_numpunct): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80746 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 491f75d..9ef62bd 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,22 @@
+2004-04-16  Paolo Carlini  <pcarlini@suse.de>
+
+       * acconfig.h: Remove _GLIBCXX_USE_LONG_DOUBLE entry, not
+       used anymore.
+       * config.h.in: Regenerate.
+
+2004-04-16  Paolo Carlini  <pcarlini@suse.de>
+
+       * config/locale/generic/monetary_members.cc
+       (moneypunct<wchar_t>::_M_initialize_moneypunct): Avoid calling
+       btowc unnecessarily, just cast to wchar_t (the concerned chars
+       all belong to the basic character set).
+       * config/locale/generic/numeric_members.cc
+       (numpunct<wchar_t>::_M_initialize_numpunct): Likewise.
+       * config/locale/gnu/monetary_members.cc
+       (moneypunct<wchar_t>::_M_initialize_moneypunct): Likewise.
+       * config/locale/gnu/numeric_members.cc
+       (numpunct<wchar_t>::_M_initialize_numpunct): Likewise.
+
 2004-04-15  Paolo Carlini  <pcarlini@suse.de>
 
        * src/locale.cc (locale::operator==): When _M_impl == __rhs._M_impl

diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h
index cad2748..c2a96c2 100644 (file)
--- a/libstdc++-v3/acconfig.h
+++ b/libstdc++-v3/acconfig.h
@@ -13,9 +13,6 @@
 // Include I/O support for 'long long' and 'unsigned long long'.
 #undef _GLIBCXX_USE_LONG_LONG
 
-// Include support for 'long double'.
-#undef _GLIBCXX_USE_LONG_DOUBLE
-
 // Define if C99 math functions (like fpclassify) should be exposed.
 #undef _GLIBCXX_USE_C99_MATH
 

diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index bef3e8c..ecb29eb 100644 (file)
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -14,9 +14,6 @@
 // Include I/O support for 'long long' and 'unsigned long long'.
 #undef _GLIBCXX_USE_LONG_LONG
 
-// Include support for 'long double'.
-#undef _GLIBCXX_USE_LONG_DOUBLE
-
 // Define if C99 math functions (like fpclassify) should be exposed.
 #undef _GLIBCXX_USE_C99_MATH
 

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<> 

diff --git a/libstdc++-v3/config/locale/generic/numeric_members.cc b/libstdc++-v3/config/locale/generic/numeric_members.cc
index e2afed9..62017e0 100644 (file)
--- a/libstdc++-v3/config/locale/generic/numeric_members.cc
+++ b/libstdc++-v3/config/locale/generic/numeric_members.cc
@@ -59,9 +59,9 @@ namespace std
        _M_data->_M_atoms_in[__i] = __num_base::_S_atoms_in[__i];
 
       _M_data->_M_truename = "true";
-      _M_data->_M_truename_size = strlen(_M_data->_M_truename);
+      _M_data->_M_truename_size = 4;
       _M_data->_M_falsename = "false";
-      _M_data->_M_falsename_size = strlen(_M_data->_M_falsename);
+      _M_data->_M_falsename_size = 5;
     }
 
   template<> 
@@ -85,23 +85,18 @@ namespace std
       _M_data->_M_thousands_sep = L',';
       
       // Use ctype::widen code without the facet...
-      unsigned char uc;
       for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-       {
-         uc = static_cast<unsigned char>(__num_base::_S_atoms_out[__i]);
-         _M_data->_M_atoms_out[__i] = btowc(uc);
-       }
+       _M_data->_M_atoms_out[__i] =
+         static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
       
       for (size_t __i = 0; __i < __num_base::_S_iend; ++__i)
-       {
-         uc = static_cast<unsigned char>(__num_base::_S_atoms_in[__i]);
-         _M_data->_M_atoms_in[__i] = btowc(uc);
-       }
+       _M_data->_M_atoms_in[__i] =
+         static_cast<wchar_t>(__num_base::_S_atoms_in[__i]);
 
       _M_data->_M_truename = L"true";
-      _M_data->_M_truename_size = wcslen(_M_data->_M_truename);
+      _M_data->_M_truename_size = 4;
       _M_data->_M_falsename = L"false";
-      _M_data->_M_falsename_size = wcslen(_M_data->_M_falsename);
+      _M_data->_M_falsename_size = 5;
     }
 
   template<> 

diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc
index 38d9c39..f1cb25f 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/monetary_members.cc
+++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc
@@ -372,12 +372,9 @@ namespace std
          _M_data->_M_neg_format = money_base::_S_default_pattern;
 
          // Use ctype::widen code without the facet...
-         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]);
        }
       else
        {
@@ -517,12 +514,9 @@ namespace std
          _M_data->_M_neg_format = money_base::_S_default_pattern;
 
          // Use ctype::widen code without the facet...
-         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]);
        }
       else
        {

diff --git a/libstdc++-v3/config/locale/gnu/numeric_members.cc b/libstdc++-v3/config/locale/gnu/numeric_members.cc
index ef1f5bf..01e9225 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/numeric_members.cc
+++ b/libstdc++-v3/config/locale/gnu/numeric_members.cc
@@ -78,10 +78,10 @@ namespace std
       // NB: There is no way to extact this info from posix locales.
       // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
       _M_data->_M_truename = "true";
-      _M_data->_M_truename_size = strlen(_M_data->_M_truename);
+      _M_data->_M_truename_size = 4;
       // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
       _M_data->_M_falsename = "false";
-      _M_data->_M_falsename_size = strlen(_M_data->_M_falsename);
+      _M_data->_M_falsename_size = 5;
     }
  
   template<> 
@@ -107,18 +107,13 @@ namespace std
          _M_data->_M_thousands_sep = L',';
 
          // Use ctype::widen code without the facet...
-         unsigned char uc;
          for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
-           {
-             uc = static_cast<unsigned char>(__num_base::_S_atoms_out[__i]);
-             _M_data->_M_atoms_out[__i] = btowc(uc);
-           }
+           _M_data->_M_atoms_out[__i] =
+             static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
 
          for (size_t __i = 0; __i < __num_base::_S_iend; ++__i)
-           {
-             uc = static_cast<unsigned char>(__num_base::_S_atoms_in[__i]);
-             _M_data->_M_atoms_in[__i] = btowc(uc);
-           }
+           _M_data->_M_atoms_in[__i] =
+             static_cast<wchar_t>(__num_base::_S_atoms_in[__i]);
        }
       else
        {
@@ -140,10 +135,10 @@ namespace std
       // NB: There is no way to extact this info from posix locales.
       // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
       _M_data->_M_truename = L"true";
-      _M_data->_M_truename_size = wcslen(_M_data->_M_truename);
+      _M_data->_M_truename_size = 4;
       // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
       _M_data->_M_falsename = L"false";
-      _M_data->_M_falsename_size = wcslen(_M_data->_M_falsename);
+      _M_data->_M_falsename_size = 5;
     }
 
   template<>