diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-07-27 09:25:14 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-07-27 09:25:14 +0000 |
| commit | b33f8e3e55932d0e15a686ef0c598da8dbc37acd (patch) | |
| tree | f3e92afe6a0cfa7683d6b9e63799c18542ab68ea /utils/unittest/googletest/include/gtest/internal/gtest-tuple.h | |
| parent | a44defeb2208376ca3113ffdddc391570ba865b8 (diff) | |
Merge gtest-1.6.0.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136212 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest/include/gtest/internal/gtest-tuple.h')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-tuple.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-tuple.h b/utils/unittest/googletest/include/gtest/internal/gtest-tuple.h index 16178fc07a..d1af50e188 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-tuple.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-tuple.h @@ -44,9 +44,9 @@ // 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: +# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: #else -#define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ +# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ template <GTEST_10_TYPENAMES_(U)> friend class tuple; \ private: #endif |