Removes dead code (by Vlad Losev). Fixes tr1 tuple's path on gcc version...

Removes dead code (by Vlad Losev).  Fixes tr1 tuple's path on gcc version before 4.0.0 (by Zhanyong Wan).

include/gtest/internal/gtest-port.h

@@ -359,12 +359,12 @@
 // gtest-port.h's responsibility to #include the header implementing
 // tr1/tuple.
 #if GTEST_HAS_TR1_TUPLE
-#if defined(__GNUC__)
-// GCC implements tr1/tuple in the <tr1/tuple> header.  This does not
-// conform to the TR1 spec, which requires the header to be <tuple>.
+#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
+// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
+// not conform to the TR1 spec, which requires the header to be <tuple>.
 #include <tr1/tuple>
 #else
-// If the compiler is not GCC, we assume the user is using a
+// If the compiler is not GCC 4.0+, we assume the user is using a
 // spec-conforming TR1 implementation.
 #include <tuple>
 #endif  // __GNUC__

test/gtest_output_test.py

@@ -262,7 +262,6 @@ class GTestOutputTest(unittest.TestCase):
     if SUPPORTS_DEATH_TESTS and SUPPORTS_TYPED_TESTS:
       self.assert_(golden == output)
     else:
-      print RemoveTestCounts(self.RemoveUnsupportedTests(golden))
       self.assert_(RemoveTestCounts(self.RemoveUnsupportedTests(golden)) ==
                    RemoveTestCounts(output))
 

test/gtest_output_test_.cc

@@ -50,13 +50,6 @@
 #include <pthread.h>
 #endif  // GTEST_HAS_PTHREAD
 
-#if GTEST_OS_LINUX
-#include <string.h>
-#include <signal.h>
-#include <string>
-#include <vector>
-#endif  // GTEST_OS_LINUX
-
 using testing::ScopedFakeTestPartResultReporter;
 using testing::TestPartResultArray;