diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 12:03:40 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 12:03:40 -0400 |
| commit | c4684b49cf0d4334dfb522fcb3c8012cb63a4f61 (patch) | |
| tree | 60b665462dff0e3767eefcc0f74ed886eb4fdaed /googlemock/test/gmock_all_test.cc | |
| parent | 431bfdcaf4a0f08c7ebd571291bf41d06195c20d (diff) | |
| download | googletest-c4684b49cf0d4334dfb522fcb3c8012cb63a4f61.tar.gz googletest-c4684b49cf0d4334dfb522fcb3c8012cb63a4f61.tar.bz2 googletest-c4684b49cf0d4334dfb522fcb3c8012cb63a4f61.zip | |
more msvc
Diffstat (limited to 'googlemock/test/gmock_all_test.cc')
| -rw-r--r-- | googlemock/test/gmock_all_test.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/googlemock/test/gmock_all_test.cc b/googlemock/test/gmock_all_test.cc index 56d6c49c..bb87729e 100644 --- a/googlemock/test/gmock_all_test.cc +++ b/googlemock/test/gmock_all_test.cc @@ -36,6 +36,15 @@ // includes most such tests, making it easier for these users to maintain // their build scripts (they just need to build this file, even though the // below list of actual *_test.cc files might change). +// 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 "test/gmock-actions_test.cc" #include "test/gmock-cardinalities_test.cc" #include "test/gmock-generated-actions_test.cc" @@ -49,3 +58,9 @@ #include "test/gmock-port_test.cc" #include "test/gmock-spec-builders_test.cc" #include "test/gmock_test.cc" + +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif +#endif |