From dd28d536eb16f98a68825c9805913969b57c5bbc Mon Sep 17 00:00:00 2001 From: vladlosev Date: Thu, 14 Apr 2011 02:42:15 +0000 Subject: [PATCH] Updates conditional directives to be consistent with the rest of the project. --- include/gmock/gmock-matchers.h | 4 ++-- 1 file 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 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 }