Use <tuple> instead of <tr1/tuple> when the compiler is not gcc, to conform with the TR1 spec.

2008-12-09 00:54:04 +00:00
parent 2051d2ccc7
commit 5145e0fb20
6 changed files with 17 additions and 20 deletions
--- 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 {