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 /test/gtest-param-test_test.cc | |
| 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 'test/gtest-param-test_test.cc')
| -rw-r--r-- | test/gtest-param-test_test.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/gtest-param-test_test.cc b/test/gtest-param-test_test.cc index 6d84dcf9..22ba1a34 100644 --- a/test/gtest-param-test_test.cc +++ b/test/gtest-param-test_test.cc @@ -42,10 +42,6 @@ #include <list> #include <vector> -#ifdef GTEST_HAS_COMBINE -#include <tr1/tuple> -#endif // GTEST_HAS_COMBINE - // To include gtest-internal-inl.h. #define GTEST_IMPLEMENTATION #include "src/gtest-internal-inl.h" // for UnitTestOptions |