From 5145e0fb203071648f4be6b77c68fabf3d92ab8a Mon Sep 17 00:00:00 2001
From: shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Tue, 9 Dec 2008 00:54:04 +0000
Subject: Use <tuple> instead of <tr1/tuple> when the compiler is not gcc, to
 conform with the TR1 spec.

---
 include/gtest/internal/gtest-param-util-generated.h.pump | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include/gtest/internal/gtest-param-util-generated.h.pump')

diff --git a/include/gtest/internal/gtest-param-util-generated.h.pump b/include/gtest/internal/gtest-param-util-generated.h.pump
index 922311cb..fe32a8e6 100644
--- a/include/gtest/internal/gtest-param-util-generated.h.pump
+++ b/include/gtest/internal/gtest-param-util-generated.h.pump
@@ -49,10 +49,6 @@ $var maxtuple = 10  $$ Maximum number of Combine arguments we want to support.
 
 #ifdef GTEST_HAS_PARAM_TEST
 
-#ifdef GTEST_HAS_COMBINE
-#include <tr1/tuple>
-#endif  // GTEST_HAS_COMBINE
-
 #include <gtest/internal/gtest-param-util.h>
 
 namespace testing {
-- 
cgit v1.2.3