am 156f77c3: am 296f17af: Merge "Fix wchar.cpp MIPS narrowing conversion build failure."

* commit '156f77c3a0a9eb9ee9acaa0aecc8ab9f2d4027c4':
  Fix wchar.cpp MIPS narrowing conversion build failure.
This commit is contained in:
Elliott Hughes 2014-05-02 00:19:44 +00:00 committed by Android Git Automerger
commit 6fbdc117db

View File

@ -89,7 +89,7 @@ TEST(wchar, wctomb_wcrtomb) {
TEST(wchar, wcstombs_wcrtombs) {
const wchar_t chars[] = { L'h', L'e', L'l', L'l', L'o', 0 };
const wchar_t bad_chars[] = { L'h', L'i', 0xffffffff, 0 };
const wchar_t bad_chars[] = { L'h', L'i', static_cast<wchar_t>(0xffffffff), 0 };
const wchar_t* src;
char bytes[BUFSIZ];