Fixes the code to work with fuse_gtest.py.

This commit is contained in:
zhanyong.wan
2009-11-10 19:17:35 +00:00
parent edba5d808c
commit 7e13e0f5dd
6 changed files with 36 additions and 17 deletions

View File

@@ -152,12 +152,15 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
#include <utility>
#endif
#if GTEST_HAS_PARAM_TEST
// scripts/fuse_gtest.py depends on gtest's own header being #included
// *unconditionally*. Therefore these #includes cannot be moved
// inside #if GTEST_HAS_PARAM_TEST.
#include <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-param-util.h>
#include <gtest/internal/gtest-param-util-generated.h>
#if GTEST_HAS_PARAM_TEST
namespace testing {
// Functions producing parameter generators.