aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2013-11-16 05:26:49 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2013-11-16 05:26:49 +0000
commit793622668ef3dede3b020f92680cbc0d71bd3f6b (patch)
treee3bf209f404270ca0ebe11f50e487ef8e0a0c901
parent3d429d80e4c062d0371fb105a87cc5260652c9b2 (diff)
downloadexternal_llvm-793622668ef3dede3b020f92680cbc0d71bd3f6b.zip
external_llvm-793622668ef3dede3b020f92680cbc0d71bd3f6b.tar.gz
external_llvm-793622668ef3dede3b020f92680cbc0d71bd3f6b.tar.bz2
gtest-death-test.cc: Move ~DeathTestFactory() to unbreak cygming build since r194865.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194918 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--utils/unittest/googletest/src/gtest-death-test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/unittest/googletest/src/gtest-death-test.cc b/utils/unittest/googletest/src/gtest-death-test.cc
index b66325e..b9693d3 100644
--- a/utils/unittest/googletest/src/gtest-death-test.cc
+++ b/utils/unittest/googletest/src/gtest-death-test.cc
@@ -735,8 +735,6 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
}
# else // We are not on Windows.
-DeathTestFactory::~DeathTestFactory() {}
-
// ForkingDeathTest provides implementations for most of the abstract
// methods of the DeathTest interface. Only the AssumeRole method is
// left undefined.
@@ -1039,6 +1037,8 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
# endif // !GTEST_OS_WINDOWS
+DeathTestFactory::~DeathTestFactory() {}
+
// Creates a concrete DeathTest-derived class that depends on the
// --gtest_death_test_style flag, and sets the pointer pointed to
// by the "test" argument to its address. If the test should be