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/test | |
| 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/test')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 4 | ||||
| -rw-r--r-- | googlemock/test/gmock-generated-function-mockers_test.cc | 7 |
2 files changed, 4 insertions, 7 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 diff --git a/googlemock/test/gmock-generated-function-mockers_test.cc b/googlemock/test/gmock-generated-function-mockers_test.cc index 02c4203c..41fbd268 100644 --- a/googlemock/test/gmock-generated-function-mockers_test.cc +++ b/googlemock/test/gmock-generated-function-mockers_test.cc @@ -46,12 +46,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -// There is a bug in MSVC (fixed in VS 2008) that prevents creating a -// mock for a function with const arguments, so we don't test such -// cases for MSVC versions older than 2008. -#if !GTEST_OS_WINDOWS || (_MSC_VER >= 1500) +#if !GTEST_OS_WINDOWS || defined(_MSC_VER) # define GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS -#endif // !GTEST_OS_WINDOWS || (_MSC_VER >= 1500) +#endif // !GTEST_OS_WINDOWS || defined(_MSC_VER) namespace testing { namespace gmock_generated_function_mockers_test { |