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. --- test/gmock_link_test.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/gmock_link_test.h') diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h index b903f3cb..bbac8ae2 100644 --- a/test/gmock_link_test.h +++ b/test/gmock_link_test.h @@ -116,7 +116,7 @@ #include -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE #include #endif @@ -176,18 +176,18 @@ using testing::WithArg; using testing::WithArgs; using testing::WithoutArgs; -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE using testing::SetErrnoAndReturn; -#endif // _WIN32_WCE +#endif #if GTEST_HAS_EXCEPTIONS using testing::Throw; -#endif // GTEST_HAS_EXCEPTIONS +#endif #if GMOCK_HAS_REGEX using testing::ContainsRegex; using testing::MatchesRegex; -#endif // GMOCK_HAS_REGEX +#endif class Interface { public: @@ -297,7 +297,7 @@ TEST(LinkTest, TestSetArrayArgument) { mock.VoidFromString(&ch); } -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE // Tests the linkage of the SetErrnoAndReturn action. TEST(LinkTest, TestSetErrnoAndReturn) { @@ -309,7 +309,7 @@ TEST(LinkTest, TestSetErrnoAndReturn) { errno = saved_errno; } -#endif // _WIN32_WCE +#endif // !GTEST_OS_WINDOWS_MOBILE // Tests the linkage of the Invoke(function) and Invoke(object, method) actions. TEST(LinkTest, TestInvoke) { -- cgit v1.2.3