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

Updates conditional directives to be consistent with the rest of the project.

Browse Source
This commit is contained in:
vladlosev 2011-04-14 02:42:15 +00:00
parent e73cf452a5
commit dd28d536eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gmock/gmock-matchers.h
View File

@ -1392,13 +1392,13 @@ class TrulyMatcher {
template <typename T> template <typename T>
bool MatchAndExplain(T& x, // NOLINT bool MatchAndExplain(T& x, // NOLINT
MatchResultListener* /* listener */) const { MatchResultListener* /* listener */) const {
#if _MSC_VER #ifdef _MSC_VER
// MSVC warns about converting a value into bool (warning 4800). // MSVC warns about converting a value into bool (warning 4800).
# pragma warning(push) // Saves the current warning state. # pragma warning(push) // Saves the current warning state.
# pragma warning(disable:4800) // Temporarily disables warning 4800. # pragma warning(disable:4800) // Temporarily disables warning 4800.
#endif #endif
return predicate_(x); return predicate_(x);
#if _MSC_VER #ifdef _MSC_VER
# pragma warning(pop) // Restores the warning state. # pragma warning(pop) // Restores the warning state.
#endif #endif
} }