gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhanyong.wan 2009-05-05 19:31:00 +00:00
parent fbaedd2d01
commit 9b23e3cc76
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gtest/internal/gtest-port.h
View File

@ -359,12 +359,12 @@
// gtest-port.h's responsibility to #include the header implementing // gtest-port.h's responsibility to #include the header implementing
// tr1/tuple. // tr1/tuple.
#if GTEST_HAS_TR1_TUPLE #if GTEST_HAS_TR1_TUPLE
#if defined(__GNUC__) #if defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
// GCC implements tr1/tuple in the <tr1/tuple> header. This does not // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
// conform to the TR1 spec, which requires the header to be <tuple>. // not conform to the TR1 spec, which requires the header to be <tuple>.
#include <tr1/tuple> #include <tr1/tuple>
#else #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. // spec-conforming TR1 implementation.
#include <tuple> #include <tuple>
#endif // __GNUC__ #endif // __GNUC__

1
test/gtest_output_test.py
View File

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

7
test/gtest_output_test_.cc
View File

@ -50,13 +50,6 @@
#include <pthread.h> #include <pthread.h>
#endif // GTEST_HAS_PTHREAD #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::ScopedFakeTestPartResultReporter;
using testing::TestPartResultArray; using testing::TestPartResultArray;