diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-05-05 19:31:00 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-05-05 19:31:00 +0000 |
| commit | 9b23e3cc7677643f6adaf6c327275d0a7cdff02c (patch) | |
| tree | 95e3e49cb3a4e924acf9cad10d4e5a338a7d5e3a /include | |
| parent | fbaedd2d017ca89d1362e54dc1890c4a5f55f240 (diff) | |
| download | googletest-9b23e3cc7677643f6adaf6c327275d0a7cdff02c.tar.gz googletest-9b23e3cc7677643f6adaf6c327275d0a7cdff02c.tar.bz2 googletest-9b23e3cc7677643f6adaf6c327275d0a7cdff02c.zip | |
Removes dead code (by Vlad Losev). Fixes tr1 tuple's path on gcc version before 4.0.0 (by Zhanyong Wan).
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index a82eec82..6910e594 100644 --- a/include/gtest/internal/gtest-port.h +++ b/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__ |