diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-06-09 06:09:53 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-06-09 06:09:53 +0000 |
| commit | bf55085d456e3ee55eb234c98c435e54d0a2d5aa (patch) | |
| tree | 32d9ace4b2fa991dd2f82f76685cb9eae0b00523 /include/gmock/internal/gmock-port.h | |
| parent | 2661c6821a4d7964697e48747c4d739e1ac3a243 (diff) | |
| download | googletest-bf55085d456e3ee55eb234c98c435e54d0a2d5aa.tar.gz googletest-bf55085d456e3ee55eb234c98c435e54d0a2d5aa.tar.bz2 googletest-bf55085d456e3ee55eb234c98c435e54d0a2d5aa.zip | |
Implements .With() as a synonym of .WithArguments(); implements AllArgs(m) as a synonym of m; relies on gtest-port to #include tuple; fixes a compatibility with Symbian.
Diffstat (limited to 'include/gmock/internal/gmock-port.h')
| -rw-r--r-- | include/gmock/internal/gmock-port.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h index 75be9edd..9ee8f728 100644 --- a/include/gmock/internal/gmock-port.h +++ b/include/gmock/internal/gmock-port.h @@ -47,18 +47,8 @@ // To avoid conditional compilation everywhere, we make it // gmock-port.h's responsibility to #include the header implementing -// tr1/tuple. -#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 <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 4.0+, we assume the user is using a -// spec-conforming TR1 implementation. -#include <tuple> -#endif // __GNUC__ +// tr1/tuple. gmock-port.h does this via gtest-port.h, which is +// guaranteed to pull in the tuple header. #if GTEST_OS_LINUX |