eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes tr1 tuple's path when compiled with gcc version < 4.0.0 (by Zhanyong Wan).

Browse Source
This commit is contained in:
zhanyong.wan 2009-05-05 19:36:44 +00:00
parent bf0d0a4481
commit 125783fb87
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/gmock/internal/gmock-port.h
View File

@ -48,12 +48,14 @@
// To avoid conditional compilation everywhere, we make it // To avoid conditional compilation everywhere, we make it
// gmock-port.h's responsibility to #include the header implementing // gmock-port.h's responsibility to #include the header implementing
// tr1/tuple. // tr1/tuple.
#if defined(__GNUC__) #if defined(__GNUC__) && GTEST_GCC_VER_ >= 40000
// GCC implements tr1/tuple in the <tr1/tuple> header. This does not // GTEST_GCC_VER_ is defined in gtest-port.h and 40000 corresponds to
// conform to the TR1 spec, which requires the header to be <tuple>. // version 4.0.0.
// 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> #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__