aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-05-12 17:32:42 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-05-12 17:32:42 +0000
commitee2f8caecc3199c8fdb03d07f0c6c653334f75b3 (patch)
treedd63adae43d7f74a7271aecd4819f4ed0cdd2332 /include
parent814a5e9310bbc8aeb0b985c1dcb66496835bf73a (diff)
downloadgoogletest-ee2f8caecc3199c8fdb03d07f0c6c653334f75b3.tar.gz
googletest-ee2f8caecc3199c8fdb03d07f0c6c653334f75b3.tar.bz2
googletest-ee2f8caecc3199c8fdb03d07f0c6c653334f75b3.zip
Simplifies the code by removing condfitional section that is no longer necessary.
Diffstat (limited to 'include')
-rw-r--r--include/gtest/internal/gtest-internal.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h
index 7aa1197f..227d8189 100644
--- a/include/gtest/internal/gtest-internal.h
+++ b/include/gtest/internal/gtest-internal.h
@@ -797,14 +797,10 @@ struct RemoveConst<const T> { typedef T type; }; // NOLINT
// 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<const T[N]> {
typedef typename RemoveConst<T>::type type[N];
};
-#endif
// A handy wrapper around RemoveConst that works when the argument
// T depends on template parameters.