diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 14:51:15 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 14:51:15 (GMT) |
| commit | 6525044ce20c22974d9eeaa1726b826c521fa84e (patch) | |
| tree | 74bb60488e3cc1c53b094ff9cd69cc24e2ea1286 /googlemock/src | |
| parent | 35a709a701cbebfcc685e35d0732dca10bac7763 (diff) | |
| download | googletest-6525044ce20c22974d9eeaa1726b826c521fa84e.zip googletest-6525044ce20c22974d9eeaa1726b826c521fa84e.tar.gz googletest-6525044ce20c22974d9eeaa1726b826c521fa84e.tar.bz2 | |
And also silence for MSVS14
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index c8241c3..619c0c5 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -50,9 +50,9 @@ #endif // Silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 14 +// to bool 'true' or 'false') for MSVC 14,15 #ifdef _MSC_VER -#if _MSC_VER == 1900 +#if _MSC_VER <= 1900 # pragma warning(push) # pragma warning(disable:4800) #endif |