diff options
author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-09-09 13:19:40 (GMT) |
---|---|---|
committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-09-09 13:19:40 (GMT) |
commit | de411c3e80120f8dcc2a3f4f62f3ca692c0431d7 (patch) | |
tree | 2740f054535234eb17796bdc199bc9fed925a2b1 | |
parent | b78f858d0c12cc71d41607b261e3cfd6c6bfa185 (diff) | |
parent | 904ad180fe5d6d49a4dbf30a31e1b7f6516ca567 (diff) | |
download | googletest-de411c3e80120f8dcc2a3f4f62f3ca692c0431d7.zip googletest-de411c3e80120f8dcc2a3f4f62f3ca692c0431d7.tar.gz googletest-de411c3e80120f8dcc2a3f4f62f3ca692c0431d7.tar.bz2 |
Merge pull request #585 from orgads/warning-fix
Fix unused static variable warning on Windows
-rw-r--r-- | googletest/src/gtest-death-test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index c076d07..a01a369 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -121,7 +121,9 @@ namespace internal { // Valid only for fast death tests. Indicates the code is running in the // child process of a fast style death test. +# if !GTEST_OS_WINDOWS static bool g_in_fast_death_test_child = false; +# endif // Returns a Boolean value indicating whether the caller is currently // executing in the context of the death test child process. Tools such as |