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/internal/gtest-param-util-generated.h.pump | |
| 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/internal/gtest-param-util-generated.h.pump')
| -rw-r--r-- | include/gtest/internal/gtest-param-util-generated.h.pump | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-param-util-generated.h.pump b/include/gtest/internal/gtest-param-util-generated.h.pump index 2da2872a..8cfcf0bf 100644 --- a/include/gtest/internal/gtest-param-util-generated.h.pump +++ b/include/gtest/internal/gtest-param-util-generated.h.pump @@ -45,12 +45,14 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ +// 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-param-util.h> #include <gtest/internal/gtest-port.h> #if GTEST_HAS_PARAM_TEST -#include <gtest/internal/gtest-param-util.h> - namespace testing { namespace internal { |