diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 20:55:46 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 20:55:46 (GMT) |
| commit | dbd206e3d9aecf4a0abe11e051b71a098252c9d2 (patch) | |
| tree | 549d4f83aa06cccf947ee664ab82795f90e4be97 /googlemock | |
| parent | 701e1e5dc1ccd25e7a55891d2dd6b4edb8f1f442 (diff) | |
| download | googletest-dbd206e3d9aecf4a0abe11e051b71a098252c9d2.zip googletest-dbd206e3d9aecf4a0abe11e051b71a098252c9d2.tar.gz googletest-dbd206e3d9aecf4a0abe11e051b71a098252c9d2.tar.bz2 | |
more mcvs fixing
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index b97bad0..39a3fe7 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -49,6 +49,14 @@ # include <unistd.h> // NOLINT #endif +// Silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 14 +#ifdef _MSC_VER && _MSC_VER == 1900 +# pragma warning(push) +# pragma warning(disable:4800) +#endif + + namespace testing { namespace internal { @@ -866,3 +874,7 @@ InSequence::~InSequence() { } } // namespace testing + +#ifdef _MSC_VER && _MSC_VER == 1900 +# pragma warning(pop) +#endif |