diff options
| author | durandal <durandal@google.com> | 2020-05-18 14:37:18 -0400 |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-05-28 19:53:43 -0400 |
| commit | a0669e070a441d8229eca5f6178ece4157413763 (patch) | |
| tree | ba27fd9f35a78bfadd92d51d13f51132daa2df79 | |
| parent | 1397db9e5833796d206896323ae50d6dc617d6e2 (diff) | |
| download | googletest-a0669e070a441d8229eca5f6178ece4157413763.tar.gz | |
Googletest export
Silence MSVC C4100 (unused formal parameter) to fix breakage from recently added testcase. This warning is silenced in many files throughout googletest, but was not needed here until this testcase was added.
PiperOrigin-RevId: 312121200
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 547f48f4..18387284 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -32,11 +32,13 @@ // // This file tests the built-in actions. -// Silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 15 +// Silence C4100 (unreferenced formal parameter) for MSVC #ifdef _MSC_VER -#if _MSC_VER == 1900 # pragma warning(push) +# pragma warning(disable:4100) +#if _MSC_VER == 1900 +// and silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 15 # pragma warning(disable:4800) #endif #endif |