From 9b23e3cc7677643f6adaf6c327275d0a7cdff02c Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 5 May 2009 19:31:00 +0000 Subject: 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/gtest') 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 header. This does not -// conform to the TR1 spec, which requires the header to be . +#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000) +// GCC 4.0+ implements tr1/tuple in the header. This does +// not conform to the TR1 spec, which requires the header to be . #include #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 #endif // __GNUC__ -- cgit v1.2.3