diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-08-09 11:54:12 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-09 11:54:12 -0400 |
| commit | 54cb8b02387ae725fcf3358a048bbec3c6a64777 (patch) | |
| tree | d35322f39aca4d394815eaba89dd5a97f90dfdb4 | |
| parent | f7042937af1b684c02145b0ddc6909e387caa81e (diff) | |
| parent | d5b31df900802ba2651ebd51dfb1a0f83edae860 (diff) | |
| download | googletest-54cb8b02387ae725fcf3358a048bbec3c6a64777.tar.gz googletest-54cb8b02387ae725fcf3358a048bbec3c6a64777.tar.bz2 googletest-54cb8b02387ae725fcf3358a048bbec3c6a64777.zip | |
Merge branch 'master' of github.com:gennadiycivil/googletest
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 854bc467..9735df18 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -244,8 +244,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) { << " for more explanation and suggested solutions, especially if" << " this is the last message you see before your test times out."; return msg.GetString(); -} -# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA +}# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA // Flag characters for reporting a death test that did not die. static const char kDeathTestLived = 'L'; |