Skip to content

GitLab

Commit e9eff488 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

msvc warnings
parent bd2a1aed
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
googlemock/test/gmock-generated-matchers_test.cc
View file @ e9eff488
...@@ -31,6 +31,13 @@ ...@@ -31,6 +31,13 @@
// //
// This file tests the built-in matchers generated by a script. // 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 "gmock/gmock-generated-matchers.h"
#include <list> #include <list>
...@@ -1327,3 +1334,7 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) { ...@@ -1327,3 +1334,7 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
#endif // GTEST_LASNG_CXX11 #endif // GTEST_LASNG_CXX11
} // namespace } // namespace
#ifdef _MSC_VER
# pragma warning(pop)
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment