diff options
author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-10-20 21:03:10 +0000 |
---|---|---|
committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-10-20 21:03:10 +0000 |
commit | bad778caa39a88b7c11b159e20730aeec4fd711e (patch) | |
tree | ab4f68a695479be0a9eaadcadc364f6c4b06d0c0 /include/gtest/internal/gtest-tuple.h.pump | |
parent | 060804deb8c05b5ea5735b875eaea2c7493e2262 (diff) | |
download | googletest-bad778caa39a88b7c11b159e20730aeec4fd711e.tar.gz googletest-bad778caa39a88b7c11b159e20730aeec4fd711e.tar.bz2 googletest-bad778caa39a88b7c11b159e20730aeec4fd711e.zip |
Implements support for AssertionResult in Boolean assertions such as EXPECT_TRUE; Fixes Google Tests's tuple implementation to default-initialize its fields in the default constructor (by Zhanyong Wan); Populates gtest_stress_test.cc with actual tests.
Diffstat (limited to 'include/gtest/internal/gtest-tuple.h.pump')
-rw-r--r-- | include/gtest/internal/gtest-tuple.h.pump | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/gtest/internal/gtest-tuple.h.pump b/include/gtest/internal/gtest-tuple.h.pump index 12821d8b..9e42423d 100644 --- a/include/gtest/internal/gtest-tuple.h.pump +++ b/include/gtest/internal/gtest-tuple.h.pump @@ -39,11 +39,11 @@ $$ This meta comment fixes auto-indentation in Emacs. }} #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_ \ @@ -140,7 +140,7 @@ class $if k < n [[GTEST_$(k)_TUPLE_(T)]] $else [[tuple]] { public: template <int k> friend class gtest_internal::Get; - tuple() {} + tuple() : $for m, [[f$(m)_()]] {} explicit tuple($for m, [[GTEST_BY_REF_(T$m) f$m]]) : [[]] $for m, [[f$(m)_(f$m)]] {} |