diff options
| author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-04-14 02:42:15 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-04-14 02:42:15 +0000 |
| commit | dd28d536eb16f98a68825c9805913969b57c5bbc (patch) | |
| tree | 726bda271417241cb19206a5b1e61a779e4b2510 /include/gmock/gmock-matchers.h | |
| parent | e73cf452a50801cf2adeb600b225ae17156f40f1 (diff) | |
| download | googletest-dd28d536eb16f98a68825c9805913969b57c5bbc.tar.gz googletest-dd28d536eb16f98a68825c9805913969b57c5bbc.tar.bz2 googletest-dd28d536eb16f98a68825c9805913969b57c5bbc.zip | |
Updates conditional directives to be consistent with the rest of the project.
Diffstat (limited to 'include/gmock/gmock-matchers.h')
| -rw-r--r-- | include/gmock/gmock-matchers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h index f401725b..b92450ca 100644 --- a/include/gmock/gmock-matchers.h +++ b/include/gmock/gmock-matchers.h @@ -1392,13 +1392,13 @@ class TrulyMatcher { template <typename T> bool MatchAndExplain(T& x, // NOLINT MatchResultListener* /* listener */) const { -#if _MSC_VER +#ifdef _MSC_VER // MSVC warns about converting a value into bool (warning 4800). # pragma warning(push) // Saves the current warning state. # pragma warning(disable:4800) // Temporarily disables warning 4800. #endif return predicate_(x); -#if _MSC_VER +#ifdef _MSC_VER # pragma warning(pop) // Restores the warning state. #endif } |