From f7af24c7de14ccb10a24909a6f3440a763cb1164 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Thu, 24 Sep 2009 21:17:24 +0000 Subject: Simplifies gmock code using gtest's OS-indicating macros. --- include/gmock/gmock-actions.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index c8edc8ab..f7daf826 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -606,7 +606,7 @@ class AssignAction { const T2 value_; }; -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE // Implements the SetErrnoAndReturn action to simulate return from // various system calls and libc functions. @@ -626,7 +626,7 @@ class SetErrnoAndReturnAction { const T result_; }; -#endif // _WIN32_WCE +#endif // !GTEST_OS_WINDOWS_MOBILE // Implements the SetArgumentPointee(x) action for any function // whose N-th argument (0-based) is a pointer to x's type. The @@ -912,7 +912,7 @@ PolymorphicAction > Assign(T1* ptr, T2 val) { return MakePolymorphicAction(internal::AssignAction(ptr, val)); } -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE // Creates an action that sets errno and returns the appropriate error. template @@ -922,7 +922,7 @@ SetErrnoAndReturn(int errval, T result) { internal::SetErrnoAndReturnAction(errval, result)); } -#endif // _WIN32_WCE +#endif // !GTEST_OS_WINDOWS_MOBILE // Various overloads for InvokeWithoutArgs(). -- cgit v1.2.3