diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-09 20:34:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 20:34:54 (GMT) |
| commit | 7f03f7ceae05d4d45fc4b12b81736c55a13d872c (patch) | |
| tree | 4aafa6e3568f424a51b13a3cba452ed9f69dc731 /googlemock/src | |
| parent | 7529698fa378528ecc8415ac9ea0c04060281409 (diff) | |
| parent | 64d24b810f37681680a84d615f2601ac73dea78a (diff) | |
| download | googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.zip googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.tar.gz googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.tar.bz2 | |
Merge pull request #1551 from gennadiycivil/master
gmock actions 2
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 2 | ||||
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index 20c5a8d..3fca3f2 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, std::cout << ::std::flush; } -void IllegalDoDefault(const char* file, int line) { +GTEST_API_ void IllegalDoDefault(const char* file, int line) { internal::Assert( false, file, line, "You are using DoDefault() inside a composite action like " diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index b97bad0..22d002f 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -49,6 +49,15 @@ # include <unistd.h> // NOLINT #endif +// 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 internal { @@ -866,3 +875,9 @@ InSequence::~InSequence() { } } // namespace testing + +#ifdef _MSC_VER +#if _MSC_VER <= 1900 +# pragma warning(pop) +#endif +#endif |