summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-09-08 05:57:37 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-09-08 05:57:37 +0000
commitb15c73341d7a7abff7a04e1de18de59ba0f34009 (patch)
tree1e5c53fe552b388109a2e55bfd00ebdf671b9d30 /test
parent5d0c3dc09ece41c649deea59f975d0ff5548424a (diff)
downloadgtest-b15c73341d7a7abff7a04e1de18de59ba0f34009.tar.gz
gtest-b15c73341d7a7abff7a04e1de18de59ba0f34009.tar.bz2
gtest-b15c73341d7a7abff7a04e1de18de59ba0f34009.tar.xz
Removes all uses of StrStream; fixes the VC projects and simplifies them by using gtest-all.cc.
git-svn-id: http://googletest.googlecode.com/svn/trunk@481 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
-rw-r--r--test/gtest-message_test.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/gtest-message_test.cc b/test/gtest-message_test.cc
index e42b034..efb6ff0 100644
--- a/test/gtest-message_test.cc
+++ b/test/gtest-message_test.cc
@@ -38,7 +38,6 @@
namespace {
using ::testing::Message;
-using ::testing::internal::StrStream;
// A helper function that turns a Message into a C string.
const char* ToCString(const Message& msg) {
@@ -154,9 +153,9 @@ TEST(MessageTest, GetString) {
// Tests streaming a Message object to an ostream.
TEST(MessageTest, StreamsToOStream) {
Message msg("Hello");
- StrStream ss;
+ ::std::stringstream ss;
ss << msg;
- EXPECT_STREQ("Hello", testing::internal::StrStreamToString(&ss).c_str());
+ EXPECT_STREQ("Hello", testing::internal::StringStreamToString(&ss).c_str());
}
// Tests that a Message object doesn't take up too much stack space.