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 /googletest/include/gtest | |
| 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 'googletest/include/gtest')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 26e787d..1c39310 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,6 +82,15 @@ namespace testing { +// Silence C4100 (unreferenced formal parameter) and 4805 +// unsafe mix of type 'const int' and type 'const bool' +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4805) +# pragma warning(disable:4100) +#endif + + // Declares the flags. // This flag temporary enables the disabled tests. @@ -2298,6 +2307,10 @@ bool StaticAssertTypeEq() { // Tries to determine an appropriate directory for the platform. GTEST_API_ std::string TempDir(); +#ifdef _MSC_VER +# pragma warning(pop) +#endif + } // namespace testing // Use this function in main() to run all tests. It returns 0 if all |