diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-11 10:22:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 10:22:10 -0400 |
| commit | d5988e7dd0b01c46a64c335b49bc2461f6219b1f (patch) | |
| tree | f7d4612dbdbe7edc06db82252ca5e8a1c0b3c948 /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| parent | 5cd213ea5ed6de0ba2b79b9403a0b5ccf48f8984 (diff) | |
| download | googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.tar.gz googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.tar.bz2 googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.zip | |
Merge pull request #1558 from gennadiycivil/master
RE-Doing the merge, this time with gcc on mac in the PR
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 37ceb549..20c95c6a 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -48,6 +48,14 @@ namespace testing { namespace internal { +// Silence MSVC C4100 (unreferenced formal parameter) and +// C4805('==': unsafe mix of type 'const int' and type 'const bool') +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4100) +# pragma warning(disable:4805) +#endif + // Joins a vector of strings as if they are fields of a tuple; returns // the joined string. GTEST_API_ std::string JoinAsTuple(const Strings& fields); @@ -510,7 +518,7 @@ struct BooleanConstant {}; // Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to // reduce code size. -void IllegalDoDefault(const char* file, int line); +GTEST_API_ void IllegalDoDefault(const char* file, int line); #if GTEST_LANG_CXX11 // Helper types for Apply() below. @@ -539,6 +547,12 @@ auto Apply(F&& f, Tuple&& args) make_int_pack<std::tuple_size<Tuple>::value>()); } #endif + + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + } // namespace internal } // namespace testing |