gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove workarounds for unsupported MSVC versions

Browse Source
This commit is contained in:
Robin Lindén
2018-11-10 15:05:55 +01:00
parent de5be0eb28
commit 826656b25f
9 changed files with 19 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/test/gmock-actions_test.cc
View File

@@ -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

7
googlemock/test/gmock-generated-function-mockers_test.cc
View File

@@ -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 {