From 125783fb87488239c062422bece2a9302489aafd Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 5 May 2009 19:36:44 +0000 Subject: [PATCH] Fixes tr1 tuple's path when compiled with gcc version < 4.0.0 (by Zhanyong Wan). --- include/gmock/internal/gmock-port.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h index b98cb113..cad195ad 100644 --- a/include/gmock/internal/gmock-port.h +++ b/include/gmock/internal/gmock-port.h @@ -48,12 +48,14 @@ // To avoid conditional compilation everywhere, we make it // gmock-port.h's responsibility to #include the header implementing // 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 +// GTEST_GCC_VER_ is defined in gtest-port.h and 40000 corresponds to +// version 4.0.0. +// 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__