eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

And more MCVS warnings

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-05 14:24:12 -04:00
parent e0f4cf0561
commit 928636135b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
googlemock/include/gmock/gmock-more-matchers.h
View File

@ -44,13 +44,12 @@
namespace testing { namespace testing {
// The macros trigger warning C4100 (unreferenced formal // The macros trigger warning C4100 (unreferenced formal
// parameter) in MSVC with -W4. Unfortunately they cannot be fixed in // parameter) in MSVC with -W4.
// the macro definition, as the warnings are generated when the macro
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
#if (_MSC_VER == 1900)
# pragma warning(disable:4800)
#endif
#endif #endif
// Defines a matcher that matches an empty container. The container must // Defines a matcher that matches an empty container. The container must