summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorMark Mentovai <mark@chromium.org>2015-11-11 17:28:15 (GMT)
committerMark Mentovai <mark@chromium.org>2015-11-11 17:28:15 (GMT)
commit8b085f0d2168e6e54712d295dcf26feac92bb9fc (patch)
tree2dabaf10eee04f4a698071714ed9bd87d9b399a3 /googletest
parent71a26ac68b28c61686b8941730a6b2577912e239 (diff)
downloadgoogletest-8b085f0d2168e6e54712d295dcf26feac92bb9fc.zip
googletest-8b085f0d2168e6e54712d295dcf26feac92bb9fc.tar.gz
googletest-8b085f0d2168e6e54712d295dcf26feac92bb9fc.tar.bz2
Fix warnings encountered in MSVC build of gtest/gmock tests
This fixes these warnings: …\gtest\googletest\test\gtest-port_test.cc(78) : error C2220: warning treated as error - no 'object' file generated …\gtest\googletest\test\gtest-port_test.cc(78) : warning C4309: 'static_cast' : truncation of constant value …\gtest\googletest\test\gtest-port_test.cc(79) : warning C4309: 'static_cast' : truncation of constant value …\gtest\googlemock\test\gmock-matchers_test.cc(2712) : error C2220: warning treated as error - no 'object' file generated …\gtest\googlemock\test\gmock-matchers_test.cc(2706) : while compiling class template member function 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to function template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' being compiled …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to class template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>' being compiled …\gtest\googlemock\test\gmock-matchers_test.cc(2712) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2714) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2716) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2717) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2718) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2721) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2723) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/gtest-port_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest-port_test.cc b/googletest/test/gtest-port_test.cc
index d17bad0..446660f 100644
--- a/googletest/test/gtest-port_test.cc
+++ b/googletest/test/gtest-port_test.cc
@@ -75,8 +75,8 @@ TEST(IsXDigitTest, WorksForNarrowAscii) {
}
TEST(IsXDigitTest, ReturnsFalseForNarrowNonAscii) {
- EXPECT_FALSE(IsXDigit(static_cast<char>(0x80)));
- EXPECT_FALSE(IsXDigit(static_cast<char>('0' | 0x80)));
+ EXPECT_FALSE(IsXDigit(static_cast<char>(0x80u)));
+ EXPECT_FALSE(IsXDigit(static_cast<char>('0' | 0x80u)));
}
TEST(IsXDigitTest, WorksForWideAscii) {