OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/66417 (std::codecvt_utf16<char32_t, 0x10FFFF, std::codecvt_mode::generate_header> generates incorrect output)

Browse Source 
PR libstdc++/66417
	* src/c++11/codecvt.cc (write_utf16_code_point): Use adjust_byte_order
	for single UTF-16 units.
	* testsuite/22_locale/codecvt/codecvt_utf16/66417.cc: New.

From-SVN: r224217
This commit is contained in:
Jonathan Wakely 2015-06-08 12:09:17 +01:00 committed by Jonathan Wakely
parent d216b2e085
commit aa4e0c43bc
3 changed files with 84 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2015-06-08 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/66417
* src/c++11/codecvt.cc (write_utf16_code_point): Use adjust_byte_order
for single UTF-16 units.
* testsuite/22_locale/codecvt/codecvt_utf16/66417.cc: New.
2015-06-07 François Dumont <fdumont@gcc.gnu.org>
* include/bits/stl_tree.h (_Rb_tree<>::__is_transparent<>): Move to

2
libstdc++-v3/src/c++11/codecvt.cc
View File

@ -319,7 +319,7 @@ namespace
{
if (to.size() > 0)
{
*to.next = codepoint;
*to.next = adjust_byte_order(codepoint, mode);
++to.next;
return true;
}

76
libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/66417.cc Normal file
View File

@ -0,0 +1,76 @@
// Copyright (C) 2015 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11" }
#include <codecvt>
#include <testsuite_hooks.h>
using namespace std;
void
test01()
{
constexpr auto mode = generate_header;
codecvt_utf16<char32_t, 0x10ffff, mode> cvt;
mbstate_t state{};
const char32_t* from = U"ABC";
const char32_t* from_next;
char to[100];
char* to_next;
cvt.out(state, from, from + 3, from_next, to, to + 100, to_next);
VERIFY((unsigned char)to[0] == 0xfe);
VERIFY((unsigned char)to[1] == 0xff);
VERIFY(to[2] == 0x00);
VERIFY(to[3] == 0x41);
VERIFY(to[4] == 0x00);
VERIFY(to[5] == 0x42);
VERIFY(to[6] == 0x00);
VERIFY(to[7] == 0x43);
}
void
test02()
{
constexpr auto mode = codecvt_mode(generate_header|little_endian);
codecvt_utf16<char32_t, 0x10ffff, mode> cvt;
mbstate_t state{};
const char32_t* from = U"ABC";
const char32_t* from_next;
char to[100];
char* to_next;
cvt.out(state, from, from + 3, from_next, to, to + 100, to_next);
VERIFY((unsigned char)to[0] == 0xff);
VERIFY((unsigned char)to[1] == 0xfe);
VERIFY(to[2] == 0x41);
VERIFY(to[3] == 0x00);
VERIFY(to[4] == 0x42);
VERIFY(to[5] == 0x00);
VERIFY(to[6] == 0x43);
VERIFY(to[7] == 0x00);
}
int
main()
{
test01();
test02();
}