diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-28 23:52:42 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-28 23:52:42 +0000 |
| commit | fc01f532a622a7d460a4eff816c56c0e501f20f7 (patch) | |
| tree | 523c049421d656a498b3260de830c70b5e2070fe /test | |
| parent | 6a036a5c8c7613e888fad39d92fc3fd84a96fbc7 (diff) | |
| download | googletest-fc01f532a622a7d460a4eff816c56c0e501f20f7.tar.gz googletest-fc01f532a622a7d460a4eff816c56c0e501f20f7.tar.bz2 googletest-fc01f532a622a7d460a4eff816c56c0e501f20f7.zip | |
Fixes unused function warning on Mac, and fixes compatibility with newer GCC.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest-death-test_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc index e42c0136..e857bc8f 100644 --- a/test/gtest-death-test_test.cc +++ b/test/gtest-death-test_test.cc @@ -465,6 +465,8 @@ TEST_F(TestForDeathTest, MixedStyles) { EXPECT_DEATH(_exit(1), ""); } +# if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD + namespace { bool pthread_flag; @@ -475,8 +477,6 @@ void SetPthreadFlag() { } // namespace -# if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD - TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) { if (!testing::GTEST_FLAG(death_test_use_fork)) { testing::GTEST_FLAG(death_test_style) = "threadsafe"; |