diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-11 10:22:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 10:22:10 -0400 |
| commit | d5988e7dd0b01c46a64c335b49bc2461f6219b1f (patch) | |
| tree | f7d4612dbdbe7edc06db82252ca5e8a1c0b3c948 /googlemock/test/gmock-actions_test.cc | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| parent | 5cd213ea5ed6de0ba2b79b9403a0b5ccf48f8984 (diff) | |
| download | googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.tar.gz googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.tar.bz2 googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.zip | |
Merge pull request #1558 from gennadiycivil/master
RE-Doing the merge, this time with gcc on mac in the PR
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 46011570..2cbf0ee3 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -33,6 +33,15 @@ // // This file tests the built-in actions. +// Silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 14,15 +#ifdef _MSC_VER +#if _MSC_VER <= 1900 +# pragma warning(push) +# pragma warning(disable:4800) +#endif +#endif + #include "gmock/gmock-actions.h" #include <algorithm> #include <iterator> @@ -1414,3 +1423,10 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) { #endif // GTEST_HAS_STD_UNIQUE_PTR_ } // Unnamed namespace + +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif +#endif + |