diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-08 05:57:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-08 05:57:37 +0000 |
| commit | 88e0df62470fa82e8d3010ef88241cd7565ebe9e (patch) | |
| tree | 1e5c53fe552b388109a2e55bfd00ebdf671b9d30 /include/gtest/internal | |
| parent | 35c39756495bea5959de5778aaaf33a94f8c1e2e (diff) | |
| download | googletest-88e0df62470fa82e8d3010ef88241cd7565ebe9e.tar.gz googletest-88e0df62470fa82e8d3010ef88241cd7565ebe9e.tar.bz2 googletest-88e0df62470fa82e8d3010ef88241cd7565ebe9e.zip | |
Removes all uses of StrStream; fixes the VC projects and simplifies them by using gtest-all.cc.
Diffstat (limited to 'include/gtest/internal')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 2 | ||||
| -rw-r--r-- | include/gtest/internal/gtest-string.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 05ee192c..bf9cc8d4 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -732,8 +732,6 @@ typedef ::wstring wstring; typedef ::std::wstring wstring; #endif // GTEST_HAS_GLOBAL_WSTRING -typedef ::std::stringstream StrStream; - // A helper for suppressing warnings on constant condition. It just // returns 'condition'. GTEST_API_ bool IsTrue(bool condition); diff --git a/include/gtest/internal/gtest-string.h b/include/gtest/internal/gtest-string.h index aff093de..05a1f89c 100644 --- a/include/gtest/internal/gtest-string.h +++ b/include/gtest/internal/gtest-string.h @@ -329,9 +329,9 @@ inline ::std::ostream& operator<<(::std::ostream& os, const String& str) { return os; } -// Gets the content of the StrStream's buffer as a String. Each '\0' +// Gets the content of the stringstream's buffer as a String. Each '\0' // character in the buffer is replaced with "\\0". -GTEST_API_ String StrStreamToString(StrStream* stream); +GTEST_API_ String StringStreamToString(::std::stringstream* stream); // Converts a streamable value to a String. A NULL pointer is // converted to "(null)". When the input value is a ::string, |