diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 20:02:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 20:02:54 (GMT) |
| commit | 1246e5807a94081049285e8fda4309f67ef571b4 (patch) | |
| tree | f2008a506ed390eb94da65cb8a0dc9351b7efb9b /googlemock/test/gmock_output_test_.cc | |
| parent | 4b6a7a49ab63f609630ce58c18a39c4048ab3ad5 (diff) | |
| parent | 2172c08c9241ab0cc8857980bbe925fe1a55cf3c (diff) | |
| download | googletest-1246e5807a94081049285e8fda4309f67ef571b4.zip googletest-1246e5807a94081049285e8fda4309f67ef571b4.tar.gz googletest-1246e5807a94081049285e8fda4309f67ef571b4.tar.bz2 | |
Merge branch 'master' into cleanup-cmake
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index ca628df..3955c73 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Tests Google Mock's output in various scenarios. This ensures that // Google Mock's messages are readable and useful. @@ -39,6 +38,12 @@ #include "gtest/gtest.h" +// Silence C4100 (unreferenced formal parameter) +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4100) +#endif + using testing::_; using testing::AnyNumber; using testing::Ge; @@ -298,3 +303,7 @@ int main(int argc, char **argv) { TestCatchesLeakedMocksInAdHocTests(); return RUN_ALL_TESTS(); } + +#ifdef _MSC_VER +# pragma warning(pop) +#endif |