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

Fix std::codecvt_utf8<wchar_t> for Mingw 

* src/c++11/codecvt.cc (__codecvt_utf8_base<wchar_t>::do_in)
	[__SIZEOF_WCHAR_T__==2 && __BYTE_ORDER__!=__ORDER_BIG_ENDIAN__]: Set
	little_endian element in bitmask.
	* testsuite/22_locale/codecvt/codecvt_utf8/69703.cc: Run all tests.
	* testsuite/22_locale/codecvt/codecvt_utf8/wchar_t/1.cc: New.

From-SVN: r260389
This commit is contained in:
Jonathan Wakely 2018-05-19 03:03:42 +01:00 committed by Jonathan Wakely
parent d84a1119da
commit a76400f4e6
4 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2018-05-19 Jonathan Wakely <jwakely@redhat.com>
* src/c++11/codecvt.cc (__codecvt_utf8_base<wchar_t>::do_in)
[__SIZEOF_WCHAR_T__==2 && __BYTE_ORDER__!=__ORDER_BIG_ENDIAN__]: Set
little_endian element in bitmask.
* testsuite/22_locale/codecvt/codecvt_utf8/69703.cc: Run all tests.
* testsuite/22_locale/codecvt/codecvt_utf8/wchar_t/1.cc: New.
2018-05-18 François Dumont <fdumont@gcc.gnu.org>
* include/bits/stl_tree.h

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

@ -1086,7 +1086,12 @@ do_in(state_type&, const extern_type* __from, const extern_type* __from_end,
reinterpret_cast<char16_t*>(__to),
reinterpret_cast<char16_t*>(__to_end)
};
auto res = ucs2_in(from, to, _M_maxcode, _M_mode);
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
codecvt_mode mode = {};
#else
codecvt_mode mode = little_endian;
#endif
auto res = ucs2_in(from, to, _M_maxcode, mode);
#elif __SIZEOF_WCHAR_T__ == 4
range<char32_t> to{
reinterpret_cast<char32_t*>(__to),

5
libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/69703.cc
View File

@ -68,7 +68,6 @@ test03()
VERIFY( in[2] == U'c' );
}
void
test04()
{
@ -90,6 +89,6 @@ main()
{
test01();
test02();
test01();
test02();
test03();
test04();
}

52
libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/wchar_t/1.cc Normal file
View File

@ -0,0 +1,52 @@
// Copyright (C) 2018 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-do run { target c++11 } }
#include <string>
#include <codecvt>
#include <testsuite_hooks.h>
void
test01()
{
const char out[] = u8"\u00A33.50";
wchar_t in[8] = {};
std::codecvt_utf8<wchar_t> cvt;
std::mbstate_t st;
const char* no;
wchar_t* ni;
auto res = cvt.in(st, out, out+6, no, in, in+8, ni);
VERIFY( res == std::codecvt_base::ok );
VERIFY( in[1] == L'3' );
VERIFY( in[2] == L'.' );
VERIFY( in[3] == L'5' );
VERIFY( in[4] == L'0' );
char out2[8] = {};
char* no2;
const wchar_t* ni2;
res = cvt.out(st, in, ni, ni2, out2, out2+8, no2);
VERIFY( res == std::codecvt_base::ok );
VERIFY( out2 == std::string(out) );
}
int
main()
{
test01();
}