diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-01-28 21:50:29 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-01-28 21:50:29 +0000 |
| commit | 81e1cc73c83265e54b2ec7edc17e77f4d1b89e86 (patch) | |
| tree | 29625437b9179b51a87fa77745ec093d50e8f1b7 /src/gtest-port.cc | |
| parent | fd6f2a8a4b3fe8beb31f26b774b460727c410b66 (diff) | |
| download | googletest-81e1cc73c83265e54b2ec7edc17e77f4d1b89e86.tar.gz googletest-81e1cc73c83265e54b2ec7edc17e77f4d1b89e86.tar.bz2 googletest-81e1cc73c83265e54b2ec7edc17e77f4d1b89e86.zip | |
Introduces macro GTEST_HAS_STREAM_REDIRECTION_ (by Vlad Losev); fixes unsynchronized color text output on Windows (by Vlad Losev); fixes the cmake script to work with MSVC 10 (by Manuel Klimek).
Diffstat (limited to 'src/gtest-port.cc')
| -rw-r--r-- | src/gtest-port.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gtest-port.cc b/src/gtest-port.cc index 1890a802..957595ad 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -441,8 +441,7 @@ GTestLog::~GTestLog() { #pragma warning(disable: 4996) #endif // _MSC_VER -// Stream capturing is not supported on Windows Mobile. -#if !GTEST_OS_WINDOWS_MOBILE +#if GTEST_HAS_STREAM_REDIRECTION_ // Object that captures an output stream (stdout/stderr). class CapturedStream { @@ -575,7 +574,7 @@ String GetCapturedStdout() { return GetCapturedStream(&g_captured_stdout); } // Stops capturing stderr and returns the captured string. String GetCapturedStderr() { return GetCapturedStream(&g_captured_stderr); } -#endif // !GTEST_OS_WINDOWS_MOBILE +#endif // GTEST_HAS_STREAM_REDIRECTION_ #if GTEST_HAS_DEATH_TEST |