Commit e76382b5 by Volker Reichelt Committed by Paolo Carlini

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
parent ac57c407
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> 2004-11-23 Chris Jefferson <chris@bubblescope.net>
* testsuite/testsuite_iterators.h: New. * testsuite/testsuite_iterators.h: New.
......
...@@ -286,7 +286,6 @@ ...@@ -286,7 +286,6 @@
result __ret = codecvt_base::error; result __ret = codecvt_base::error;
if (__state._M_good()) if (__state._M_good())
{ {
typedef state_type::__desc_type __desc_type;
const __desc_type* __desc = __state._M_get_out_descriptor(); const __desc_type* __desc = __state._M_get_out_descriptor();
const size_t __fmultiple = sizeof(intern_type); const size_t __fmultiple = sizeof(intern_type);
size_t __fbytes = __fmultiple * (__from_end - __from); size_t __fbytes = __fmultiple * (__from_end - __from);
...@@ -308,7 +307,8 @@ ...@@ -308,7 +307,8 @@
if (__int_bom) if (__int_bom)
{ {
size_t __size = __from_end - __from; 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); __cfixed[0] = static_cast<intern_type>(__int_bom);
char_traits<intern_type>::copy(__cfixed + 1, __from, __size); char_traits<intern_type>::copy(__cfixed + 1, __from, __size);
__cfrom = reinterpret_cast<char*>(__cfixed); __cfrom = reinterpret_cast<char*>(__cfixed);
...@@ -353,7 +353,6 @@ ...@@ -353,7 +353,6 @@
result __ret = codecvt_base::error; result __ret = codecvt_base::error;
if (__state._M_good()) if (__state._M_good())
{ {
typedef state_type::__desc_type __desc_type;
const __desc_type* __desc = __state._M_get_in_descriptor(); const __desc_type* __desc = __state._M_get_in_descriptor();
const size_t __tmultiple = sizeof(intern_type); const size_t __tmultiple = sizeof(intern_type);
size_t __tlen = __tmultiple * (__to_end - __to); size_t __tlen = __tmultiple * (__to_end - __to);
...@@ -391,7 +390,6 @@ ...@@ -391,7 +390,6 @@
result __ret = codecvt_base::error; result __ret = codecvt_base::error;
if (__state._M_good()) if (__state._M_good())
{ {
typedef state_type::__desc_type __desc_type;
const __desc_type* __desc = __state._M_get_in_descriptor(); const __desc_type* __desc = __state._M_get_in_descriptor();
const size_t __fmultiple = sizeof(extern_type); const size_t __fmultiple = sizeof(extern_type);
size_t __flen = __fmultiple * (__from_end - __from); size_t __flen = __fmultiple * (__from_end - __from);
...@@ -413,7 +411,8 @@ ...@@ -413,7 +411,8 @@
if (__ext_bom) if (__ext_bom)
{ {
size_t __size = __from_end - __from; 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); __cfixed[0] = static_cast<extern_type>(__ext_bom);
char_traits<extern_type>::copy(__cfixed + 1, __from, __size); char_traits<extern_type>::copy(__cfixed + 1, __from, __size);
__cfrom = reinterpret_cast<char*>(__cfixed); __cfrom = reinterpret_cast<char*>(__cfixed);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment