diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-16 11:52:22 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-16 11:52:22 -0400 |
| commit | e4ab316c85c172de3717bebd68fcb1d4eb420ccf (patch) | |
| tree | d0193b6284c2252b15c50f010561b073d9e1954a /googlemock/test | |
| parent | 1944bc0f510fa631b8d35075b4ff95c3efeacf39 (diff) | |
| download | googletest-e4ab316c85c172de3717bebd68fcb1d4eb420ccf.tar.gz googletest-e4ab316c85c172de3717bebd68fcb1d4eb420ccf.tar.bz2 googletest-e4ab316c85c172de3717bebd68fcb1d4eb420ccf.zip | |
more msvc
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc index 85108558..bc9df722 100644 --- a/googlemock/test/gmock-generated-matchers_test.cc +++ b/googlemock/test/gmock-generated-matchers_test.cc @@ -32,10 +32,11 @@ // This file tests the built-in matchers generated by a script. // Silence warning C4244: 'initializing': conversion from 'int' to 'short', -// possible loss of data +// possible loss of data C4100: : unreferenced formal parameter #ifdef _MSC_VER # pragma warning(push) # pragma warning(disable:4244) +# pragma warning(disable:4100) #endif #include "gmock/gmock-generated-matchers.h" |