diff -ru gmock.orig/include/gmock/internal/gmock-port.h gmock/include/gmock/internal/gmock-port.h --- gmock.orig/include/gmock/internal/gmock-port.h 2009-05-22 23:58:41.000000000 -0700 +++ gmock/include/gmock/internal/gmock-port.h 2009-05-23 00:49:01.000000000 -0700 @@ -54,9 +54,14 @@ // GCC 4.0+ implements tr1/tuple in the header. This does // not conform to the TR1 spec, which requires the header to be . #include +#elif defined(_MSC_VER) && _MSC_VER < 1500 +// For Visual Studio older than 2008, we redirect directly to boost tuple +// searching from boost's root. This is to avoid extra dirtying of the +// compiler include paths. +#include "boost/tr1/tr1/tuple" #else -// If the compiler is not GCC 4.0+, we assume the user is using a -// spec-conforming TR1 implementation. +// If the compiler is neither GCC 4.0+, nor Visual Studio 2008, we assume the +// user is using a spec-conforming TR1 implementation. #include #endif // __GNUC__