gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cont. deal with MCVS warnings

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-06 10:15:00 -04:00
parent b5c87fbcb6
commit 50c0bcd7e3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@ namespace testing {
// Silence C4100 (unreferenced formal // Silence C4100 (unreferenced formal
// parameter) for MSVC // parameter) for MSVC
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
#if (_MSC_VER == 1900) #if (_MSC_VER == 1900)
# pragma warning(disable:4800) # pragma warning(disable:4800)
@ -78,6 +79,11 @@ MATCHER(IsFalse, negation ? "is true" : "is false") {
return !static_cast<bool>(arg); return !static_cast<bool>(arg);
} }
#ifdef _MSC_VER
# pragma warning(pop)
#endif
} // namespace testing } // namespace testing
#endif // GMOCK_GMOCK_MORE_MATCHERS_H_ #endif // GMOCK_GMOCK_MORE_MATCHERS_H_

12
googlemock/include/gmock/internal/gmock-internal-utils.h
View File

@ -48,10 +48,12 @@
namespace testing { namespace testing {
namespace internal { namespace internal {
// Silence C4100 (unreferenced formal // Silence MSVC C4100 (unreferenced formal parameter) and
// parameter) for MSVC // C4805('==': unsafe mix of type 'const int' and type 'const bool')
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
# pragma warning(disable:C4805)
#endif #endif
// Joins a vector of strings as if they are fields of a tuple; returns // Joins a vector of strings as if they are fields of a tuple; returns
@ -545,6 +547,12 @@ auto Apply(F&& f, Tuple&& args)
make_int_pack<std::tuple_size<Tuple>::value>()); make_int_pack<std::tuple_size<Tuple>::value>());
} }
#endif #endif
#ifdef _MSC_VER
# pragma warning(pop)
#endif
} // namespace internal } // namespace internal
} // namespace testing } // namespace testing