diff options
| author | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 15:05:55 +0100 |
|---|---|---|
| committer | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 15:20:26 +0100 |
| commit | 826656b25f62ed0a2fadc7c5dde303616e621c08 (patch) | |
| tree | 01db8e689dc6d256d0a5d65dad6d714cc39b8273 /googlemock/src | |
| parent | de5be0eb28b74ecd6335e3bd61d9dc8914ce0e57 (diff) | |
| download | googletest-826656b25f62ed0a2fadc7c5dde303616e621c08.tar.gz googletest-826656b25f62ed0a2fadc7c5dde303616e621c08.tar.bz2 googletest-826656b25f62ed0a2fadc7c5dde303616e621c08.zip | |
Remove workarounds for unsupported MSVC versions
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index e8b51f6c..5db774ed 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,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 @@ -887,7 +887,7 @@ InSequence::~InSequence() { } // namespace testing #ifdef _MSC_VER -#if _MSC_VER <= 1900 +#if _MSC_VER == 1900 # pragma warning(pop) #endif #endif |