diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 16:31:11 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 16:31:11 -0400 |
| commit | 2d4d4ef7392bc577449ade669b282853cb7adb39 (patch) | |
| tree | dea34d2fb896bb0eaff22f7418a9df26b4761f3e /googlemock/include/gmock/gmock-more-matchers.h | |
| parent | 5fe8de5ded685541a63b0ac22b1cfb4c59406dfd (diff) | |
| download | googletest-2d4d4ef7392bc577449ade669b282853cb7adb39.tar.gz googletest-2d4d4ef7392bc577449ade669b282853cb7adb39.tar.bz2 googletest-2d4d4ef7392bc577449ade669b282853cb7adb39.zip | |
fixing MSVC
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index 4c248325..6d810eb7 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -49,6 +49,8 @@ namespace testing { # pragma warning(push) # pragma warning(disable:4100) #if (_MSC_VER == 1900) +// and silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 14 # pragma warning(disable:4800) #endif #endif |