2004-11-24 Volker Reichelt <reichelt@igpm.rwth-aachen.de>

	* config/locale/ieee_1003.1-2001/codecvt_specializations.h
	(do_out, do_unshift, do_in): Remove redundant typedef.

From-SVN: r91156

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 75fd077bb99006b8311b16312dff195d05636e45..0b94b8a1cfa6b11318e9919d4d1eab33d6b7bb3f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-24  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       * config/locale/ieee_1003.1-2001/codecvt_specializations.h
+       (do_out, do_unshift, do_in): Remove redundant typedef.
+
 2004-11-23  Chris Jefferson  <chris@bubblescope.net>
 
        * testsuite/testsuite_iterators.h: New.

diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
index 268a79e362780600c165b3c795320b6e95d452fb..29f12d93ea3bf97d21a73c7869d91f55cbb8d7ca 100644 (file)
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
@@ -286,7 +286,6 @@
       result __ret = codecvt_base::error;
       if (__state._M_good())
        {
-         typedef state_type::__desc_type       __desc_type;
          const __desc_type* __desc = __state._M_get_out_descriptor();
          const size_t __fmultiple = sizeof(intern_type);
          size_t __fbytes = __fmultiple * (__from_end - __from);
@@ -308,7 +307,8 @@
          if (__int_bom)
            {     
              size_t __size = __from_end - __from;
-             intern_type* __cfixed = static_cast<intern_type*>(__builtin_alloca(sizeof(intern_type) * (__size + 1)));
+             intern_type* __cfixed = static_cast<intern_type*>
+               (__builtin_alloca(sizeof(intern_type) * (__size + 1)));
              __cfixed[0] = static_cast<intern_type>(__int_bom);
              char_traits<intern_type>::copy(__cfixed + 1, __from, __size);
              __cfrom = reinterpret_cast<char*>(__cfixed);
@@ -353,7 +353,6 @@
       result __ret = codecvt_base::error;
       if (__state._M_good())
        {
-         typedef state_type::__desc_type       __desc_type;
          const __desc_type* __desc = __state._M_get_in_descriptor();
          const size_t __tmultiple = sizeof(intern_type);
          size_t __tlen = __tmultiple * (__to_end - __to); 
@@ -391,7 +390,6 @@
       result __ret = codecvt_base::error;
       if (__state._M_good())
        {
-         typedef state_type::__desc_type       __desc_type;
          const __desc_type* __desc = __state._M_get_in_descriptor();
          const size_t __fmultiple = sizeof(extern_type);
          size_t __flen = __fmultiple * (__from_end - __from);
@@ -413,7 +411,8 @@
          if (__ext_bom)
            {     
              size_t __size = __from_end - __from;
-             extern_type* __cfixed =  static_cast<extern_type*>(__builtin_alloca(sizeof(extern_type) * (__size + 1)));
+             extern_type* __cfixed =  static_cast<extern_type*>
+               (__builtin_alloca(sizeof(extern_type) * (__size + 1)));
              __cfixed[0] = static_cast<extern_type>(__ext_bom);
              char_traits<extern_type>::copy(__cfixed + 1, __from, __size);
              __cfrom = reinterpret_cast<char*>(__cfixed);