diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2002-03-25 13:22:20 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2002-03-25 13:22:20 +0000 |
| commit | 9cc737e8dab914c2e3cbb460fc0569206f515378 (patch) | |
| tree | 6dc044eeaff05716df9dd5b8d2ed4bdda95f4c8c | |
| parent | 2ed1f154c1fb02bc5def93f2c707d8474d6e8369 (diff) | |
| download | gcc-9cc737e8dab914c2e3cbb460fc0569206f515378.zip gcc-9cc737e8dab914c2e3cbb460fc0569206f515378.tar.gz gcc-9cc737e8dab914c2e3cbb460fc0569206f515378.tar.bz2 | |
2002-03-25 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
Paolo Carlini <pcarlini@unitus.it>
* testsuite/locale/codecvt_members_unicode_char.cc
(test01, test02): Fix i_lit_base arrays, making them
independent from the endianness of the platform.
Co-Authored-By: Paolo Carlini <pcarlini@unitus.it>
From-SVN: r51314
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/codecvt_members_unicode_char.cc | 22 |
2 files changed, 19 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3f061e6..fc08d72 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2002-03-25 Ulrich Weigand <Ulrich.Weigand@de.ibm.com> + Paolo Carlini <pcarlini@unitus.it> + + * testsuite/locale/codecvt_members_unicode_char.cc + (test01, test02): Fix i_lit_base arrays, making them + independent from the endianness of the platform. + 2002-03-22 Benjamin Kosnik <bkoz@redhat.com> * acinclude.m4 (GLIBCPP_CHECK_COMPLEX_MATH_SUPP): Just test for diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_members_unicode_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_members_unicode_char.cc index 026e609..39882b7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_members_unicode_char.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_members_unicode_char.cc @@ -72,13 +72,14 @@ void test01() 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 @@ void test02() 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; |