aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/gmock/gmock-actions.h4
-rw-r--r--include/gmock/gmock-matchers.h4
-rw-r--r--include/gmock/internal/gmock-port.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h
index 7aa5274c..823054bf 100644
--- a/include/gmock/gmock-actions.h
+++ b/include/gmock/gmock-actions.h
@@ -678,12 +678,12 @@ class SetArrayArgumentAction {
// Microsoft compiler deprecates ::std::copy, so we want to suppress warning
// 4996 (Function call with parameters that may be unsafe) there.
-#ifdef GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS
#pragma warning(push) // Saves the current warning state.
#pragma warning(disable:4996) // Temporarily disables warning 4996.
#endif // GTEST_OS_WINDOWS
::std::copy(first_, last_, ::std::tr1::get<N>(args));
-#ifdef GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS
#pragma warning(pop) // Restores the warning state.
#endif // GTEST_OS_WINDOWS
}
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h
index 525128b9..e6af144c 100644
--- a/include/gmock/gmock-matchers.h
+++ b/include/gmock/gmock-matchers.h
@@ -1141,13 +1141,13 @@ class TrulyMatcher {
// interested in the address of the argument.
template <typename T>
bool Matches(T& x) const {
-#ifdef GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS
// 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 // GTEST_OS_WINDOWS
return predicate_(x);
-#ifdef GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS
#pragma warning(pop) // Restores the warning state.
#endif // GTEST_OS_WINDOWS
}
diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h
index 45b95cde..cb352192 100644
--- a/include/gmock/internal/gmock-port.h
+++ b/include/gmock/internal/gmock-port.h
@@ -58,7 +58,7 @@
#include <tuple>
#endif // __GNUC__
-#ifdef GTEST_OS_LINUX
+#if GTEST_OS_LINUX
// On some platforms, <regex.h> needs someone to define size_t, and
// won't compile otherwise. We can #include it here as we already
@@ -85,7 +85,7 @@ namespace internal {
// For Windows, check the compiler version. At least VS 2005 SP1 is
// required to compile Google Mock.
-#ifdef GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS
#if _MSC_VER < 1400
#error "At least Visual Studio 2005 SP1 is required to compile Google Mock."