diff options
| author | James Zern <jzern@google.com> | 2016-07-13 18:36:17 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-07-13 18:36:17 -0700 |
| commit | a07bb842152c540165d9b757204465c507b74716 (patch) | |
| tree | 8968b63b835cd16b705bd81f225a6179ebbdbe26 /third_party | |
| parent | 7eec1f31b50e05f6fe06bccda8db08d75a6ff0f2 (diff) | |
| download | libvpx-a07bb842152c540165d9b757204465c507b74716.tar.gz libvpx-a07bb842152c540165d9b757204465c507b74716.tar.bz2 libvpx-a07bb842152c540165d9b757204465c507b74716.zip | |
gtest-all.cc: quiet an unused variable warning
under windows / mingw builds
Change-Id: I93f9a5df77cea0c28d4afb272abcde5a9732e355
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/googletest/README.libvpx | 4 | ||||
| -rw-r--r-- | third_party/googletest/src/src/gtest-all.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/googletest/README.libvpx b/third_party/googletest/README.libvpx index 1eca78dd9..0e3b8b937 100644 --- a/third_party/googletest/README.libvpx +++ b/third_party/googletest/README.libvpx @@ -16,4 +16,6 @@ Local Modifications: free build. - Added GTEST_ATTRIBUTE_UNUSED_ to test registering dummies in TEST_P and INSTANTIATE_TEST_CASE_P to remove warnings about unused variables - under GCC 5.
\ No newline at end of file + under GCC 5. +- Only define g_in_fast_death_test_child for non-Windows builds; quiets an + unused variable warning. diff --git a/third_party/googletest/src/src/gtest-all.cc b/third_party/googletest/src/src/gtest-all.cc index 8d906279a..912868148 100644 --- a/third_party/googletest/src/src/gtest-all.cc +++ b/third_party/googletest/src/src/gtest-all.cc @@ -6612,9 +6612,11 @@ GTEST_DEFINE_string_( namespace internal { +# if !GTEST_OS_WINDOWS // Valid only for fast death tests. Indicates the code is running in the // child process of a fast style death test. static bool g_in_fast_death_test_child = false; +# endif // !GTEST_OS_WINDOWS // Returns a Boolean value indicating whether the caller is currently // executing in the context of the death test child process. Tools such as |