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 | 4b88dddfe24f51a6cecedfde7cbb128029646e4f (patch) | |
| tree | 37d724d53579343200b2ca5493edd8b291d0b297 /include/gtest/internal/gtest-param-util.h | |
| parent | 122c66e14103ddfeeb5460f09cd389f3e9f0de1f (diff) | |
| download | gtest-4b88dddfe24f51a6cecedfde7cbb128029646e4f.tar.gz gtest-4b88dddfe24f51a6cecedfde7cbb128029646e4f.tar.bz2 gtest-4b88dddfe24f51a6cecedfde7cbb128029646e4f.tar.xz | |
Fixes the code to work with fuse_gtest.py.
git-svn-id: http://googletest.googlecode.com/svn/trunk@337 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/internal/gtest-param-util.h')
| -rw-r--r-- | include/gtest/internal/gtest-param-util.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-param-util.h b/include/gtest/internal/gtest-param-util.h index dcc5494..19295d7 100644 --- a/include/gtest/internal/gtest-param-util.h +++ b/include/gtest/internal/gtest-param-util.h @@ -38,17 +38,19 @@ #include <utility> #include <vector> +// 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-linked_ptr.h> #include <gtest/internal/gtest-port.h> #if GTEST_HAS_PARAM_TEST #if GTEST_HAS_RTTI -#include <typeinfo> +#include <typeinfo> // NOLINT #endif // GTEST_HAS_RTTI -#include <gtest/internal/gtest-linked_ptr.h> -#include <gtest/internal/gtest-internal.h> - namespace testing { namespace internal { |