... and this
This commit is contained in:
parent
c1d4c34233
commit
64d24b810f
@ -39,13 +39,11 @@
|
|||||||
|
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
|
// Silence C4100 (unreferenced formal parameter)
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER <= 1900
|
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
# pragma warning(disable:4100)
|
# pragma warning(disable:4100)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
using testing::_;
|
using testing::_;
|
||||||
using testing::AnyNumber;
|
using testing::AnyNumber;
|
||||||
@ -308,7 +306,5 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER <= 1900
|
|
||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user