diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-26 19:03:47 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-26 19:03:47 +0000 |
| commit | 3c7bbf5b46679aea4e0ac7d3ad241cb036146751 (patch) | |
| tree | f452879c8f86232be2dec970ec7bce3a9963ed49 /include/gtest/internal/gtest-death-test-internal.h | |
| parent | f3c6efd8d78f96a9a500b3ba7e024de122b9afa1 (diff) | |
| download | googletest-3c7bbf5b46679aea4e0ac7d3ad241cb036146751.tar.gz googletest-3c7bbf5b46679aea4e0ac7d3ad241cb036146751.tar.bz2 googletest-3c7bbf5b46679aea4e0ac7d3ad241cb036146751.zip | |
Simplifies implementation by defining a POSIX portability layer; adds the death test style flag to --help.
Diffstat (limited to 'include/gtest/internal/gtest-death-test-internal.h')
| -rw-r--r-- | include/gtest/internal/gtest-death-test-internal.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/gtest/internal/gtest-death-test-internal.h b/include/gtest/internal/gtest-death-test-internal.h index 1e12a3df..46afbe1d 100644 --- a/include/gtest/internal/gtest-death-test-internal.h +++ b/include/gtest/internal/gtest-death-test-internal.h @@ -39,12 +39,6 @@ #include <gtest/internal/gtest-internal.h> -#if GTEST_HAS_DEATH_TEST && GTEST_OS_WINDOWS -#include <io.h> -#elif GTEST_HAS_DEATH_TEST -#include <unistd.h> -#endif // GTEST_HAS_DEATH_TEST && GTEST_OS_WINDOWS - namespace testing { namespace internal { @@ -203,15 +197,7 @@ class InternalRunDeathTestFlag { ~InternalRunDeathTestFlag() { if (write_fd_ >= 0) -// Suppress MSVC complaints about POSIX functions. -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4996) -#endif // _MSC_VER - close(write_fd_); -#ifdef _MSC_VER -#pragma warning(pop) -#endif // _MSC_VER + posix::close(write_fd_); } String file() const { return file_; } |