gtest-all.cc: quiet an unused variable warning
under windows / mingw builds Change-Id: I93f9a5df77cea0c28d4afb272abcde5a9732e355
This commit is contained in:
parent
7eec1f31b5
commit
a07bb84215
2
third_party/googletest/README.libvpx
vendored
2
third_party/googletest/README.libvpx
vendored
@ -17,3 +17,5 @@ Local Modifications:
|
|||||||
- Added GTEST_ATTRIBUTE_UNUSED_ to test registering dummies in TEST_P
|
- Added GTEST_ATTRIBUTE_UNUSED_ to test registering dummies in TEST_P
|
||||||
and INSTANTIATE_TEST_CASE_P to remove warnings about unused variables
|
and INSTANTIATE_TEST_CASE_P to remove warnings about unused variables
|
||||||
under GCC 5.
|
under GCC 5.
|
||||||
|
- Only define g_in_fast_death_test_child for non-Windows builds; quiets an
|
||||||
|
unused variable warning.
|
||||||
|
2
third_party/googletest/src/src/gtest-all.cc
vendored
2
third_party/googletest/src/src/gtest-all.cc
vendored
@ -6612,9 +6612,11 @@ GTEST_DEFINE_string_(
|
|||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
|
# if !GTEST_OS_WINDOWS
|
||||||
// Valid only for fast death tests. Indicates the code is running in the
|
// Valid only for fast death tests. Indicates the code is running in the
|
||||||
// child process of a fast style death test.
|
// child process of a fast style death test.
|
||||||
static bool g_in_fast_death_test_child = false;
|
static bool g_in_fast_death_test_child = false;
|
||||||
|
# endif // !GTEST_OS_WINDOWS
|
||||||
|
|
||||||
// Returns a Boolean value indicating whether the caller is currently
|
// Returns a Boolean value indicating whether the caller is currently
|
||||||
// executing in the context of the death test child process. Tools such as
|
// executing in the context of the death test child process. Tools such as
|
||||||
|
Loading…
Reference in New Issue
Block a user