diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-04-07 18:36:50 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-04-07 18:36:50 +0000 |
| commit | c2df1529d41617b516a4d89241940433b03f10aa (patch) | |
| tree | 91de61aa484a7ec79aeae5e4ae78184ec8d920b2 /test | |
| parent | 9777673650126252f9de8447e0ea4f4e451d1ce4 (diff) | |
| download | gtest-c2df1529d41617b516a4d89241940433b03f10aa.tar.gz | |
makes gtest compatible with HP UX (by Pasi Valminen); fixes a typo in the name of xlC (by Hady Zalek).
git-svn-id: http://googletest.googlecode.com/svn/trunk@563 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 46db38d..6834e8c 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -3824,8 +3824,8 @@ TEST(AssertionTest, NamedEnum) { // The version of gcc used in XCode 2.2 has a bug and doesn't allow // anonymous enums in assertions. Therefore the following test is not // done on Mac. -// Sun Studio also rejects this code. -#if !GTEST_OS_MAC && !defined(__SUNPRO_CC) +// Sun Studio and HP aCC also reject this code. +#if !GTEST_OS_MAC && !defined(__SUNPRO_CC) && !defined(__HP_aCC) // Tests using assertions with anonymous enums. enum { |