more msvc
This commit is contained in:
parent
1944bc0f51
commit
e4ab316c85
@ -32,10 +32,11 @@
|
|||||||
// This file tests the built-in matchers generated by a script.
|
// This file tests the built-in matchers generated by a script.
|
||||||
|
|
||||||
// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
|
// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
|
||||||
// possible loss of data
|
// possible loss of data C4100: : unreferenced formal parameter
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
# pragma warning(disable:4244)
|
# pragma warning(disable:4244)
|
||||||
|
# pragma warning(disable:4100)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "gmock/gmock-generated-matchers.h"
|
#include "gmock/gmock-generated-matchers.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user