diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-08 05:57:37 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-08 05:57:37 (GMT) |
| commit | 88e0df62470fa82e8d3010ef88241cd7565ebe9e (patch) | |
| tree | 1e5c53fe552b388109a2e55bfd00ebdf671b9d30 /include/gtest/gtest.h | |
| parent | 35c39756495bea5959de5778aaaf33a94f8c1e2e (diff) | |
| download | googletest-88e0df62470fa82e8d3010ef88241cd7565ebe9e.zip googletest-88e0df62470fa82e8d3010ef88241cd7565ebe9e.tar.gz googletest-88e0df62470fa82e8d3010ef88241cd7565ebe9e.tar.bz2 | |
Removes all uses of StrStream; fixes the VC projects and simplifies them by using gtest-all.cc.
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 73f0578..41d2796 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -1517,18 +1517,18 @@ AssertionResult CmpHelperFloatingPointEQ(const char* expected_expression, return AssertionSuccess(); } - StrStream expected_ss; + ::std::stringstream expected_ss; expected_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2) << expected; - StrStream actual_ss; + ::std::stringstream actual_ss; actual_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2) << actual; return EqFailure(expected_expression, actual_expression, - StrStreamToString(&expected_ss), - StrStreamToString(&actual_ss), + StringStreamToString(&expected_ss), + StringStreamToString(&actual_ss), false); } |