diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-02-03 02:27:02 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-02-03 02:27:02 +0000 |
| commit | cfcbc298cd91806e0e3417e03fce42bc4f1fa150 (patch) | |
| tree | af456a0d47524f6bb5cbb49d160e0aaf60110daf /include/gtest/internal/gtest-tuple.h | |
| parent | 8d373310561a8d68d2a22ca7c6613deff5fa6e05 (diff) | |
| download | googletest-cfcbc298cd91806e0e3417e03fce42bc4f1fa150.tar.gz googletest-cfcbc298cd91806e0e3417e03fce42bc4f1fa150.tar.bz2 googletest-cfcbc298cd91806e0e3417e03fce42bc4f1fa150.zip | |
Adds Solaris support (by Hady Zalek)
Diffstat (limited to 'include/gtest/internal/gtest-tuple.h')
| -rw-r--r-- | include/gtest/internal/gtest-tuple.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-tuple.h b/include/gtest/internal/gtest-tuple.h index c201f5c0..16178fc0 100644 --- a/include/gtest/internal/gtest-tuple.h +++ b/include/gtest/internal/gtest-tuple.h @@ -42,7 +42,8 @@ // 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__) +// 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_ \ |