This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[PATCH, RFC] Fix codecvt_members_unicode_char.cc on s390/powerpc
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: Ulrich dot Weigand at de dot ibm dot com
- Cc: libstdc++ at gcc dot gnu dot org
- Date: Fri, 22 Mar 2002 23:08:03 +0100
- Subject: [PATCH, RFC] Fix codecvt_members_unicode_char.cc on s390/powerpc
Hi,
I have prepared the below, directly inspired by Ulrich analysis, which I find compelling.
Ulrich, could you please test it?
Ciao, Paolo.
/////////////
--- codecvt_members_unicode_char.cc.~1.2.~ Fri Feb 8 02:34:41 2002
+++ codecvt_members_unicode_char.cc Fri Mar 22 23:01:09 2002
@@ -72,13 +72,14 @@
const ext_type* e_lit = "black pearl jasmine tea";
int size = strlen(e_lit);
- int_type i_lit_base[25] =
+ char i_lit_base[50] =
{
- 0x6200, 0x6c00, 0x6100, 0x6300, 0x6b00, 0x2000, 0x7000, 0x6500, 0x6100,
- 0x7200, 0x6c00, 0x2000, 0x6a00, 0x6100, 0x7300, 0x6d00, 0x6900, 0x6e00,
- 0x6500, 0x2000, 0x7400, 0x6500, 0x6100, 0xa000
+ 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20,
+ 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20,
+ 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e,
+ 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0
};
- const int_type* i_lit = i_lit_base;
+ const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base);
const ext_type* efrom_next;
const int_type* ifrom_next;
@@ -158,13 +159,14 @@
const ext_type* e_lit = "black pearl jasmine tea";
int size = strlen(e_lit);
- int_type i_lit_base[25] =
+ char i_lit_base[50] =
{
- 0x0062, 0x006c, 0x0061, 0x0063, 0x006b, 0x0020, 0x0070, 0x0065, 0x0061,
- 0x0072, 0x006c, 0x0020, 0x006a, 0x0061, 0x0073, 0x006d, 0x0069, 0x006e,
- 0x0065, 0x0020, 0x0074, 0x0065, 0x0061, 0x00a0
+ 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, 0x00,
+ 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, 0x00,
+ 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00,
+ 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0, 0x00
};
- const int_type* i_lit = i_lit_base;
+ const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base);
const ext_type* efrom_next;
const int_type* ifrom_next;