From 535de5338c3a76bc75905694ac15731e3f0bfc8d Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Fri, 7 Aug 2009 06:47:47 +0000 Subject: 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). git-svn-id: http://googletest.googlecode.com/svn/trunk@289 861a406c-534a-0410-8894-cb66d6ee9925 --- src/gtest-port.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/gtest-port.cc') diff --git a/src/gtest-port.cc b/src/gtest-port.cc index bc6d8f8..09d1a8e 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -431,8 +431,6 @@ void GTestLog(GTestLogSeverity severity, const char* file, } } -#if GTEST_HAS_STD_STRING - // Disable Microsoft deprecation warnings for POSIX functions called from // this class (creat, dup, dup2, and close) #ifdef _MSC_VER @@ -514,7 +512,7 @@ static size_t GetFileSize(FILE * file) { } // Reads the entire content of a file as a string. -static ::std::string ReadEntireFile(FILE * file) { +static String ReadEntireFile(FILE * file) { const size_t file_size = GetFileSize(file); char* const buffer = new char[file_size]; @@ -530,7 +528,7 @@ static ::std::string ReadEntireFile(FILE * file) { bytes_read += bytes_last_read; } while (bytes_last_read > 0 && bytes_read < file_size); - const ::std::string content(buffer, buffer+bytes_read); + const String content(buffer, bytes_read); delete[] buffer; return content; @@ -547,11 +545,11 @@ void CaptureStderr() { // Stops capturing stderr and returns the captured string. // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can // use it here. -::std::string GetCapturedStderr() { +String GetCapturedStderr() { g_captured_stderr->StopCapture(); FILE* const file = posix::FOpen(g_captured_stderr->filename().c_str(), "r"); - const ::std::string content = ReadEntireFile(file); + const String content = ReadEntireFile(file); posix::FClose(file); delete g_captured_stderr; @@ -560,8 +558,6 @@ void CaptureStderr() { return content; } -#endif // GTEST_HAS_STD_STRING - #if GTEST_HAS_DEATH_TEST // A copy of all command line arguments. Set by InitGoogleTest(). -- cgit v1.2.3