diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:48:02 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:48:02 (GMT) |
| commit | 431bfdcaf4a0f08c7ebd571291bf41d06195c20d (patch) | |
| tree | b22397dfa8178ebd64306972ef42dda199e13bbd /googlemock/src | |
| parent | 8bc7c631e848e7fc9eef2d95eeac12966caefb43 (diff) | |
| download | googletest-431bfdcaf4a0f08c7ebd571291bf41d06195c20d.zip googletest-431bfdcaf4a0f08c7ebd571291bf41d06195c20d.tar.gz googletest-431bfdcaf4a0f08c7ebd571291bf41d06195c20d.tar.bz2 | |
msvc 14
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-all.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/googlemock/src/gmock-all.cc b/googlemock/src/gmock-all.cc index 7aebce7..203bdb9 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 |