diff options
| -rw-r--r-- | include/gtest/internal/gtest-internal.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index fcf4c717..cd6fd79b 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -788,13 +788,14 @@ struct RemoveConst { typedef T type; }; // NOLINT template <typename T> struct RemoveConst<const T> { typedef T type; }; // NOLINT -// MSVC 8.0 and Sun C++ have a bug which causes the above definition -// to fail to remove the const in 'const int[3]'. The following -// specialization works around the bug. However, it causes trouble -// with GCC and thus needs to be conditionally compiled. -#if defined(_MSC_VER) || defined(__SUNPRO_CC) +// MSVC 8.0, Sun C++, and IBM XL C++ have a bug which causes the above +// definition to fail to remove the const in 'const int[3]' and 'const +// char[3][4]'. The following specialization works around the bug. +// However, it causes trouble with GCC and thus needs to be +// conditionally compiled. +#if defined(_MSC_VER) || defined(__SUNPRO_CC) || defined(__IBMCPP__) template <typename T, size_t N> -struct RemoveConst<T[N]> { +struct RemoveConst<const T[N]> { typedef typename RemoveConst<T>::type type[N]; }; #endif |