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/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