diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 15:57:16 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 15:57:16 -0400 |
| commit | e1071eb9497304a38e69737e90a88b4877b8b736 (patch) | |
| tree | a3f997e6412a22622588cb7e7468920678774054 /googlemock/test/gmock-actions_test.cc | |
| parent | d0de1180e44bb279361ebe3ce9ba3d860bdad4b2 (diff) | |
| download | googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.gz googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.bz2 googletest-e1071eb9497304a38e69737e90a88b4877b8b736.zip | |
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging 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 ea6129d7..5dd48460 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> @@ -1556,3 +1565,10 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) { #endif // GTEST_LANG_CXX11 } // Unnamed namespace + +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif +#endif + |