diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-08 23:52:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-08 23:52:59 +0000 |
| commit | 170daa042cb0ef3e5d7839f79d052a683b3c670f (patch) | |
| tree | 92377a4ca75847eb8b74c16743a35d069ab179c4 | |
| parent | b69645248887ddb88517b07c1617d390fdce9c9f (diff) | |
| parent | a5c6b2ecb55afd75630cbe38dd2b88172cfa304d (diff) | |
| download | android_bionic-170daa042cb0ef3e5d7839f79d052a683b3c670f.tar.gz android_bionic-170daa042cb0ef3e5d7839f79d052a683b3c670f.tar.bz2 android_bionic-170daa042cb0ef3e5d7839f79d052a683b3c670f.zip | |
Merge "wchar_test.cpp: fix error between comparison signed and unsigned integer"
| -rw-r--r-- | tests/wchar_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp index a92ac9d65..0d15f21eb 100644 --- a/tests/wchar_test.cpp +++ b/tests/wchar_test.cpp @@ -250,13 +250,13 @@ TEST(wchar, mbrtowc) { ASSERT_EQ(L'a', out[0]); // 2-byte UTF-8. ASSERT_EQ(2U, mbrtowc(out, "\xc2\xa2" "cdef", 6, NULL)); - ASSERT_EQ(0x00a2, out[0]); + ASSERT_EQ(static_cast<wchar_t>(0x00a2), out[0]); // 3-byte UTF-8. ASSERT_EQ(3U, mbrtowc(out, "\xe2\x82\xac" "def", 6, NULL)); - ASSERT_EQ(0x20ac, out[0]); + ASSERT_EQ(static_cast<wchar_t>(0x20ac), out[0]); // 4-byte UTF-8. ASSERT_EQ(4U, mbrtowc(out, "\xf0\xa4\xad\xa2" "ef", 6, NULL)); - ASSERT_EQ(0x24b62, out[0]); + ASSERT_EQ(static_cast<wchar_t>(0x24b62), out[0]); #if __BIONIC__ // glibc allows this. // Illegal 5-byte UTF-8. ASSERT_EQ(static_cast<size_t>(-1), mbrtowc(out, "\xf8\xa1\xa2\xa3\xa4" "f", 6, NULL)); |