diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-10 19:17:35 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-10 19:17:35 +0000 |
| commit | 7e13e0f5dd2f9458e0a613e0a91c894eb80126fc (patch) | |
| tree | 37d724d53579343200b2ca5493edd8b291d0b297 /include/gtest/gtest-param-test.h | |
| parent | edba5d808c10731938a23a53daf182a297124607 (diff) | |
| download | googletest-7e13e0f5dd2f9458e0a613e0a91c894eb80126fc.tar.gz googletest-7e13e0f5dd2f9458e0a613e0a91c894eb80126fc.tar.bz2 googletest-7e13e0f5dd2f9458e0a613e0a91c894eb80126fc.zip | |
Fixes the code to work with fuse_gtest.py.
Diffstat (limited to 'include/gtest/gtest-param-test.h')
| -rw-r--r-- | include/gtest/gtest-param-test.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/gtest/gtest-param-test.h b/include/gtest/gtest-param-test.h index 6c8622a6..c0c85e3e 100644 --- a/include/gtest/gtest-param-test.h +++ b/include/gtest/gtest-param-test.h @@ -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. |