eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes compatibility with Sun C++ (by Hady Zalek); fixes compatibility

Browse Source 
with Android (by Zachary Vorhies).
This commit is contained in:
zhanyong.wan 2011-03-11 23:05:00 +00:00
parent 5451ffe816
commit 5017fe0090
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/gtest/internal/gtest-internal.h
View File

@ -788,16 +788,16 @@ struct RemoveConst { typedef T type; }; // NOLINT
template <typename T> template <typename T>
struct RemoveConst<const T> { typedef T type; }; // NOLINT struct RemoveConst<const T> { typedef T type; }; // NOLINT
// MSVC 8.0 has a bug which causes the above definition to fail to // MSVC 8.0 and Sun C++ have a bug which causes the above definition
// remove the const in 'const int[3]'. The following specialization // to fail to remove the const in 'const int[3]'. The following
// works around the bug. However, it causes trouble with gcc and thus // specialization works around the bug. However, it causes trouble
// needs to be conditionally compiled. // with GCC and thus needs to be conditionally compiled.
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__SUNPRO_CC)
template <typename T, size_t N> template <typename T, size_t N>
struct RemoveConst<T[N]> { struct RemoveConst<T[N]> {
typedef typename RemoveConst<T>::type type[N]; typedef typename RemoveConst<T>::type type[N];
}; };
#endif // _MSC_VER #endif
// A handy wrapper around RemoveConst that works when the argument // A handy wrapper around RemoveConst that works when the argument
// T depends on template parameters. // T depends on template parameters.

10
include/gtest/internal/gtest-port.h
View File

@ -87,6 +87,7 @@
// GTEST_OS_AIX - IBM AIX // GTEST_OS_AIX - IBM AIX
// GTEST_OS_CYGWIN - Cygwin // GTEST_OS_CYGWIN - Cygwin
// GTEST_OS_LINUX - Linux // GTEST_OS_LINUX - Linux
// GTEST_OS_LINUX_ANDROID - Google Android
// GTEST_OS_MAC - Mac OS X // GTEST_OS_MAC - Mac OS X
// GTEST_OS_NACL - Google Native Client (NaCl) // GTEST_OS_NACL - Google Native Client (NaCl)
// GTEST_OS_SOLARIS - Sun Solaris // GTEST_OS_SOLARIS - Sun Solaris
@ -225,6 +226,9 @@
# define GTEST_OS_MAC 1 # define GTEST_OS_MAC 1
#elif defined __linux__ #elif defined __linux__
# define GTEST_OS_LINUX 1 # define GTEST_OS_LINUX 1
# ifdef ANDROID
# define GTEST_OS_LINUX_ANDROID 1
# endif // ANDROID
#elif defined __MVS__ #elif defined __MVS__
# define GTEST_OS_ZOS 1 # define GTEST_OS_ZOS 1
#elif defined(__sun) && defined(__SVR4) #elif defined(__sun) && defined(__SVR4)
@ -336,8 +340,10 @@
// is available. // is available.
// Cygwin 1.7 and below doesn't support ::std::wstring. // Cygwin 1.7 and below doesn't support ::std::wstring.
// Solaris' libc++ doesn't support it either. // Solaris' libc++ doesn't support it either. Android has
# define GTEST_HAS_STD_WSTRING (!(GTEST_OS_CYGWIN || GTEST_OS_SOLARIS)) // no support for it at least as recent as Froyo (2.2).
# define GTEST_HAS_STD_WSTRING \
(!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS))
#endif // GTEST_HAS_STD_WSTRING #endif // GTEST_HAS_STD_WSTRING

6
src/gtest.cc
View File

@ -1621,11 +1621,11 @@ bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
#if GTEST_OS_WINDOWS #if GTEST_OS_WINDOWS
return _wcsicmp(lhs, rhs) == 0; return _wcsicmp(lhs, rhs) == 0;
#elif GTEST_OS_LINUX #elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
return wcscasecmp(lhs, rhs) == 0; return wcscasecmp(lhs, rhs) == 0;
#else #else
// Mac OS X and Cygwin don't define wcscasecmp. Other unknown OSes // Android, Mac OS X and Cygwin don't define wcscasecmp.
// may not define it either. // Other unknown OSes may not define it either.
wint_t left, right; wint_t left, right;
do { do {
left = towlower(*lhs++); left = towlower(*lhs++);