diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-12-09 00:54:04 +0000 |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-12-09 00:54:04 +0000 |
| commit | 5145e0fb203071648f4be6b77c68fabf3d92ab8a (patch) | |
| tree | 2fae4919ff4d2bb3a7d66f19b020a5d6d676f7e6 /include/gtest/gtest-param-test.h | |
| parent | 2051d2ccc782225096c4a10c280051061809ed4e (diff) | |
| download | googletest-5145e0fb203071648f4be6b77c68fabf3d92ab8a.tar.gz googletest-5145e0fb203071648f4be6b77c68fabf3d92ab8a.tar.bz2 googletest-5145e0fb203071648f4be6b77c68fabf3d92ab8a.zip | |
Use <tuple> instead of <tr1/tuple> when the compiler is not gcc, to conform with the TR1 spec.
Diffstat (limited to 'include/gtest/gtest-param-test.h')
| -rw-r--r-- | include/gtest/gtest-param-test.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/gtest/gtest-param-test.h b/include/gtest/gtest-param-test.h index 2f19c3b3..2d63237f 100644 --- a/include/gtest/gtest-param-test.h +++ b/include/gtest/gtest-param-test.h @@ -156,9 +156,6 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); #include <gtest/internal/gtest-internal.h> #include <gtest/internal/gtest-param-util.h> #include <gtest/internal/gtest-param-util-generated.h> -#ifdef GTEST_HAS_COMBINE -#include <tr1/tuple> -#endif // GTEST_HAS_COMBINE namespace testing { |