diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-01-21 00:32:01 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-01-21 00:32:01 +0000 |
| commit | bbab12725025270beb12cb62a73b9cfc33bdec85 (patch) | |
| tree | 401a86bb3c1652194e1cbb63c79c46d50af0e951 /include/gtest/internal/gtest-port.h | |
| parent | 2456258bb1512f12119be15b3f07ce9b91aa3131 (diff) | |
| download | googletest-bbab12725025270beb12cb62a73b9cfc33bdec85.tar.gz googletest-bbab12725025270beb12cb62a73b9cfc33bdec85.tar.bz2 googletest-bbab12725025270beb12cb62a73b9cfc33bdec85.zip | |
Improves compatibility with cygwin by making the definition of GTEST_HAS_GLOBAL_WSTRING correct on this platform.
Diffstat (limited to 'include/gtest/internal/gtest-port.h')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 6a1593ef..b3ffc882 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -226,7 +226,8 @@ // is available. #if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) -// At least some versions of cygwin don't support ::std::wstring. +// Cygwin 1.5 and below doesn't support ::std::wstring. +// Cygwin 1.7 might add wstring support; this should be updated when clear. // Solaris' libc++ doesn't support it either. #define GTEST_HAS_STD_WSTRING 0 #else @@ -238,7 +239,8 @@ #ifndef GTEST_HAS_GLOBAL_WSTRING // The user didn't tell us whether ::wstring is available, so we need // to figure it out. -#define GTEST_HAS_GLOBAL_WSTRING GTEST_HAS_GLOBAL_STRING +#define GTEST_HAS_GLOBAL_WSTRING \ + (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING) #endif // GTEST_HAS_GLOBAL_WSTRING #if GTEST_HAS_STD_STRING || GTEST_HAS_GLOBAL_STRING || \ |