aboutsummaryrefslogtreecommitdiffstats
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
commit88e0df62470fa82e8d3010ef88241cd7565ebe9e (patch)
tree1e5c53fe552b388109a2e55bfd00ebdf671b9d30 /test
parent35c39756495bea5959de5778aaaf33a94f8c1e2e (diff)
downloadgoogletest-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 '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 e42b0344..efb6ff08 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.