diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-08-07 06:47:47 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-08-07 06:47:47 +0000 |
| commit | 535de5338c3a76bc75905694ac15731e3f0bfc8d (patch) | |
| tree | ca41796e67c988e8985cc084e1c6136aa609df39 /include/gtest/internal/gtest-tuple.h | |
| parent | 96ac1fd602a5d0c8c9c32c0d0bfd065cf73129e6 (diff) | |
| download | gtest-535de5338c3a76bc75905694ac15731e3f0bfc8d.tar.gz gtest-535de5338c3a76bc75905694ac15731e3f0bfc8d.tar.bz2 gtest-535de5338c3a76bc75905694ac15731e3f0bfc8d.tar.xz | |
Implements EXPECT_DEATH_IF_SUPPORTED (by Vlad Losev); Fixes compatibility with Symbian (by Araceli Checa); Removes GetCapturedStderr()'s dependency on std::string (by Vlad Losev).
git-svn-id: http://googletest.googlecode.com/svn/trunk@289 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/internal/gtest-tuple.h')
| -rw-r--r-- | include/gtest/internal/gtest-tuple.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/gtest/internal/gtest-tuple.h b/include/gtest/internal/gtest-tuple.h index 5ef4920..86b200b 100644 --- a/include/gtest/internal/gtest-tuple.h +++ b/include/gtest/internal/gtest-tuple.h @@ -38,11 +38,11 @@ #include <utility> // For ::std::pair. -// The compiler used in Symbian 5th Edition (__S60_50__) has a bug -// that prevents us from declaring the tuple template as a friend (it -// complains that tuple is redefined). This hack bypasses the bug by -// declaring the members that should otherwise be private as public. -#if defined(__SYMBIAN32__) && __S60_50__ +// The compiler used in Symbian has a bug that prevents us from declaring the +// tuple template as a friend (it complains that tuple is redefined). This +// hack bypasses the bug by declaring the members that should otherwise be +// private as public. +#if defined(__SYMBIAN32__) #define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: #else #define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ |