commit caff5f2e1a1c23f70ecf529a84d4d75d2445a44a
author Ben Cheng <bccheng@google.com> Mon May 19 14:27:31 2014 -0700
committer Ben Cheng <bccheng@google.com> Mon May 19 14:27:31 2014 -0700
tree 3f0f50cf09a5fd34d755c06a02e544e41c4b125d
parent 6c83305c9a0c43eff407f3b4a2ff10ad0be26f01

Address additional warnings found by GCC 4.9.

Change-Id: If668a6eb98a6ce7b2872f528b8e3527638814f68

tests/wchar_test.cpp

diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp
index c8aec2d..50b8608 100644
--- a/tests/wchar_test.cpp
+++ b/tests/wchar_test.cpp
@@ -306,19 +306,19 @@
   // 2-byte UTF-8.
   ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xc2", 1, ps));
   ASSERT_EQ(1U, mbrtowc(&out, "\xa2" "cdef", 5, ps));
-  ASSERT_EQ(0x00a2, out);
+  ASSERT_EQ(static_cast<wchar_t>(0x00a2), out);
   ASSERT_TRUE(mbsinit(ps));
   // 3-byte UTF-8.
   ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xe2", 1, ps));
   ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\x82", 1, ps));
   ASSERT_EQ(1U, mbrtowc(&out, "\xac" "def", 4, ps));
-  ASSERT_EQ(0x20ac, out);
+  ASSERT_EQ(static_cast<wchar_t>(0x20ac), out);
   ASSERT_TRUE(mbsinit(ps));
   // 4-byte UTF-8.
   ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xf0", 1, ps));
   ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xa4\xad", 2, ps));
   ASSERT_EQ(1U, mbrtowc(&out, "\xa2" "ef", 3, ps));
-  ASSERT_EQ(0x24b62, out);
+  ASSERT_EQ(static_cast<wchar_t>(0x24b62), out);
   ASSERT_TRUE(mbsinit(ps));
 
   // Invalid 2-byte
@@ -341,9 +341,9 @@
   const char* valid = "A" "\xc2\xa2" "\xe2\x82\xac" "\xf0\xa4\xad\xa2" "ef";
   ASSERT_EQ(4U, mbsrtowcs(out, &valid, 4, ps));
   ASSERT_EQ(L'A', out[0]);
-  ASSERT_EQ(0x00a2, out[1]);
-  ASSERT_EQ(0x20ac, out[2]);
-  ASSERT_EQ(0x24b62, out[3]);
+  ASSERT_EQ(static_cast<wchar_t>(0x00a2), out[1]);
+  ASSERT_EQ(static_cast<wchar_t>(0x20ac), out[2]);
+  ASSERT_EQ(static_cast<wchar_t>(0x24b62), out[3]);
   ASSERT_EQ('e', *valid);
 
   const char* invalid = "A" "\xc2\x20" "ef";