diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 14:01:40 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 14:01:40 (GMT) |
| commit | b5c87fbcb6b708026bc83c01e38a43691c9064a0 (patch) | |
| tree | 037bb577157f515bbaae2a020cfc5cc55bd5763f /googlemock | |
| parent | 427b6a297fa1f6d038fd55c6ad214116a85f1860 (diff) | |
| download | googletest-b5c87fbcb6b708026bc83c01e38a43691c9064a0.zip googletest-b5c87fbcb6b708026bc83c01e38a43691c9064a0.tar.gz googletest-b5c87fbcb6b708026bc83c01e38a43691c9064a0.tar.bz2 | |
Deal with MCVS warnings
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 37ceb54..030a1d6 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -48,6 +48,12 @@ namespace testing { namespace internal { +// Silence C4100 (unreferenced formal +// parameter) for MSVC +#ifdef _MSC_VER +# pragma warning(disable:4100) +#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); |