diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-11-13 21:10:41 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-11-13 21:10:42 -0500 |
| commit | 7a0680dc223088211807f1b19598dfe01b3bab8b (patch) | |
| tree | 8cc0e01ea848a037e681143cb521bc08e4132c5b /googlemock/test/gmock-actions_test.cc | |
| parent | b18d39bd2ea2d2b508228a9a1d8ae9f7fba32f78 (diff) | |
| parent | 48021336904c12e129e372a46b0995647a345b1e (diff) | |
| download | googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.tar.gz googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.tar.bz2 googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.zip | |
Merge pull request #1959 from robinlinden:remove-msvc-workarounds
PiperOrigin-RevId: 221356626
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 0de84811..5b9f3dd6 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -33,9 +33,9 @@ // This file tests the built-in actions. // Silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 14,15 +// to bool 'true' or 'false') for MSVC 15 #ifdef _MSC_VER -#if _MSC_VER <= 1900 +#if _MSC_VER == 1900 # pragma warning(push) # pragma warning(disable:4800) #endif |