commit 29d10e3de8f5258fec25174eb5f55eb19577859e
author Dmitriy Ivanov <dimitry@google.com> Fri May 09 00:52:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 09 00:52:08 2014 +0000
tree 60db535c308690f405d0583df35bc64b5212ac59
parent 170daa042cb0ef3e5d7839f79d052a683b3c670f
parent 7db180919c335287b201e859faa8ee0dbe281cde

Merge "Test dlopen with symlinked .so files"

tests/wchar_test.cpp

diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp
index a92ac9d..0d15f21 100644
--- a/tests/wchar_test.cpp
+++ b/tests/wchar_test.cpp
@@ -250,13 +250,13 @@
   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));