summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2013-02-28 23:52:42 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2013-02-28 23:52:42 +0000
commit74de57c951aedebc5dfe26a27604353432392b98 (patch)
tree523c049421d656a498b3260de830c70b5e2070fe /test
parent2733a36231e9e59dfe0648562ac021ccea0e27d8 (diff)
downloadgtest-74de57c951aedebc5dfe26a27604353432392b98.tar.gz
gtest-74de57c951aedebc5dfe26a27604353432392b98.tar.bz2
gtest-74de57c951aedebc5dfe26a27604353432392b98.tar.xz
Fixes unused function warning on Mac, and fixes compatibility with newer GCC.gtest-embtk-1.1.0
git-svn-id: http://googletest.googlecode.com/svn/trunk@643 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
-rw-r--r--test/gtest-death-test_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc
index e42c013..e857bc8 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";