diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 11:48:02 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 11:48:02 -0400 |
| commit | 431bfdcaf4a0f08c7ebd571291bf41d06195c20d (patch) | |
| tree | b22397dfa8178ebd64306972ef42dda199e13bbd | |
| parent | 8bc7c631e848e7fc9eef2d95eeac12966caefb43 (diff) | |
| download | googletest-431bfdcaf4a0f08c7ebd571291bf41d06195c20d.tar.gz googletest-431bfdcaf4a0f08c7ebd571291bf41d06195c20d.tar.bz2 googletest-431bfdcaf4a0f08c7ebd571291bf41d06195c20d.zip | |
msvc 14
| -rw-r--r-- | googlemock/src/gmock-all.cc | 16 | ||||
| -rw-r--r-- | googlemock/test/gmock-more-actions_test.cc | 14 |
2 files changed, 16 insertions, 14 deletions
diff --git a/googlemock/src/gmock-all.cc b/googlemock/src/gmock-all.cc index 7aebce7a..203bdb93 100644 --- a/googlemock/src/gmock-all.cc +++ b/googlemock/src/gmock-all.cc @@ -37,6 +37,16 @@ // This line ensures that gmock.h can be compiled on its own, even // when it's fused. + +// 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.h" // The following lines pull in the real gmock *.cc files. @@ -45,3 +55,9 @@ #include "src/gmock-matchers.cc" #include "src/gmock-spec-builders.cc" #include "src/gmock.cc" + +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif +#endif diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index e9b272b3..f5e28eae 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -42,15 +42,6 @@ #include "gtest/gtest.h" #include "gtest/internal/gtest-linked_ptr.h" -// 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 - namespace testing { namespace gmock_more_actions_test { @@ -718,8 +709,3 @@ TEST(ReturnPointeeTest, Works) { } // namespace gmock_generated_actions_test } // namespace testing -#ifdef _MSC_VER -#if _MSC_VER == 1900 -# pragma warning(pop) -#endif -#endif |