diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-24 21:17:24 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-24 21:17:24 +0000 |
| commit | f7af24c7de14ccb10a24909a6f3440a763cb1164 (patch) | |
| tree | a17cf98a60d67d6b32fb699c0ec6308b4a707d94 /test/gmock-actions_test.cc | |
| parent | b0d1c08ff2dc98a1f2ed395ccfed5585ff048d2b (diff) | |
| download | googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.tar.gz googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.tar.bz2 googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.zip | |
Simplifies gmock code using gtest's OS-indicating macros.
Diffstat (limited to 'test/gmock-actions_test.cc')
| -rw-r--r-- | test/gmock-actions_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index 772f0605..5d05bc50 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -70,9 +70,9 @@ using testing::ReturnNull; using testing::ReturnRef; using testing::SetArgumentPointee; -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE using testing::SetErrnoAndReturn; -#endif // _WIN32_WCE +#endif #if GMOCK_HAS_PROTOBUF_ using testing::internal::TestMessage; @@ -911,7 +911,7 @@ TEST(AssignTest, CompatibleTypes) { EXPECT_DOUBLE_EQ(5, x); } -#ifndef _WIN32_WCE +#if !GTEST_OS_WINDOWS_MOBILE class SetErrnoAndReturnTest : public testing::Test { protected: @@ -938,7 +938,7 @@ TEST_F(SetErrnoAndReturnTest, CompatibleTypes) { EXPECT_EQ(EINVAL, errno); } -#endif // _WIN32_WCE +#endif // !GTEST_OS_WINDOWS_MOBILE // Tests ByRef(). |