Skip to content

G
googletest
Commit bbab1272 by zhanyong.wan
Options

Improves compatibility with cygwin by making the definition of…

Improves compatibility with cygwin by making the definition of GTEST_HAS_GLOBAL_WSTRING correct on this platform.
parent 2456258b
Showing with 4 additions and 2 deletions
include/gtest/internal/gtest-port.h
...@@ -226,7 +226,8 @@ ...@@ -226,7 +226,8 @@
// is available. // is available.
#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) #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. // Solaris' libc++ doesn't support it either.
#define GTEST_HAS_STD_WSTRING 0 #define GTEST_HAS_STD_WSTRING 0
#else #else
...@@ -238,7 +239,8 @@ ...@@ -238,7 +239,8 @@
#ifndef GTEST_HAS_GLOBAL_WSTRING #ifndef GTEST_HAS_GLOBAL_WSTRING
// The user didn't tell us whether ::wstring is available, so we need // The user didn't tell us whether ::wstring is available, so we need
// to figure it out. // 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 #endif // GTEST_HAS_GLOBAL_WSTRING
#if GTEST_HAS_STD_STRING || GTEST_HAS_GLOBAL_STRING || \ #if GTEST_HAS_STD_STRING || GTEST_HAS_GLOBAL_STRING || \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment