summaryrefslogtreecommitdiffstats
path: root/googlemock/test
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-16 15:32:16 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-16 15:32:16 (GMT)
commite9eff488f9a41e95773d2c361294a0ffee5bbe65 (patch)
treed2493b5f26ea191707bbb10ac4e40ff6822b14e3 /googlemock/test
parentbd2a1aed03c8319f43ee01ed675d2a2365aac7c5 (diff)
downloadgoogletest-e9eff488f9a41e95773d2c361294a0ffee5bbe65.zip
googletest-e9eff488f9a41e95773d2c361294a0ffee5bbe65.tar.gz
googletest-e9eff488f9a41e95773d2c361294a0ffee5bbe65.tar.bz2
msvc warnings
Diffstat (limited to 'googlemock/test')
-rw-r--r--googlemock/test/gmock-generated-matchers_test.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc
index f24d7c8..9190522 100644
--- a/googlemock/test/gmock-generated-matchers_test.cc
+++ b/googlemock/test/gmock-generated-matchers_test.cc
@@ -31,6 +31,13 @@
//
// This file tests the built-in matchers generated by a script.
+// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
+// possible loss of data
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:C4244)
+#endif
+
#include "gmock/gmock-generated-matchers.h"
#include <list>
@@ -1327,3 +1334,7 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
#endif // GTEST_LASNG_CXX11
} // namespace
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif