aboutsummaryrefslogtreecommitdiffstats
path: root/test/gmock_link_test.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-09-24 21:17:24 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-09-24 21:17:24 +0000
commitf7af24c7de14ccb10a24909a6f3440a763cb1164 (patch)
treea17cf98a60d67d6b32fb699c0ec6308b4a707d94 /test/gmock_link_test.h
parentb0d1c08ff2dc98a1f2ed395ccfed5585ff048d2b (diff)
downloadgoogletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.tar.gz
googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.tar.bz2
googletest-f7af24c7de14ccb10a24909a6f3440a763cb1164.zip
Simplifies gmock code using gtest's OS-indicating macros.
Diffstat (limited to 'test/gmock_link_test.h')
-rw-r--r--test/gmock_link_test.h14
1 files changed, 7 insertions, 7 deletions
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 <gmock/gmock.h>
-#ifndef _WIN32_WCE
+#if !GTEST_OS_WINDOWS_MOBILE
#include <errno.h>
#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) {