diff options
Diffstat (limited to 'gtest/include/gtest/internal/gtest-tuple.h.pump')
| -rw-r--r-- | gtest/include/gtest/internal/gtest-tuple.h.pump | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtest/include/gtest/internal/gtest-tuple.h.pump b/gtest/include/gtest/internal/gtest-tuple.h.pump index 12821d8..85ebc80 100644 --- a/gtest/include/gtest/internal/gtest-tuple.h.pump +++ b/gtest/include/gtest/internal/gtest-tuple.h.pump @@ -39,11 +39,12 @@ $$ 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. +// Sun Studio versions < 12 also have the above bug. +#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) #define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: #else #define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ @@ -140,7 +141,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)]] {} |