diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-08-07 06:47:47 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-08-07 06:47:47 +0000 |
| commit | ed8500b341c473ecf46acd13951ae5b4e3acc780 (patch) | |
| tree | ca41796e67c988e8985cc084e1c6136aa609df39 /include/gtest/internal/gtest-port.h | |
| parent | 18c31d64e120919e8e04df3035234b9afe8eb6d9 (diff) | |
| download | googletest-ed8500b341c473ecf46acd13951ae5b4e3acc780.tar.gz googletest-ed8500b341c473ecf46acd13951ae5b4e3acc780.tar.bz2 googletest-ed8500b341c473ecf46acd13951ae5b4e3acc780.zip | |
Implements EXPECT_DEATH_IF_SUPPORTED (by Vlad Losev); Fixes compatibility with Symbian (by Araceli Checa); Removes GetCapturedStderr()'s dependency on std::string (by Vlad Losev).
Diffstat (limited to 'include/gtest/internal/gtest-port.h')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index e67a498d..58b2eaf8 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -696,10 +696,8 @@ inline void FlushInfoLog() { fflush(NULL); } // CaptureStderr - starts capturing stderr. // GetCapturedStderr - stops capturing stderr and returns the captured string. -#if GTEST_HAS_STD_STRING void CaptureStderr(); -::std::string GetCapturedStderr(); -#endif // GTEST_HAS_STD_STRING +String GetCapturedStderr(); #if GTEST_HAS_DEATH_TEST |