diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-10-22 01:33:11 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-10-22 01:33:11 +0000 |
| commit | 25958f3e4c4097caca8347b7937f5f6fb26d6c56 (patch) | |
| tree | 7a9633942ef81e21ec74834e715777e2e062fb43 /src | |
| parent | 50f4deb1cf3ef32282c13b7cb84a81b1bf61e0d8 (diff) | |
| download | googletest-25958f3e4c4097caca8347b7937f5f6fb26d6c56.tar.gz googletest-25958f3e4c4097caca8347b7937f5f6fb26d6c56.tar.bz2 googletest-25958f3e4c4097caca8347b7937f5f6fb26d6c56.zip | |
Fixes compiler warning when built with -std=c++0x.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 0d41e465..ea3a47c5 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -945,8 +945,8 @@ Message& Message::operator <<(const ::wstring& wstr) { AssertionResult::AssertionResult(const AssertionResult& other) : success_(other.success_), message_(other.message_.get() != NULL ? - new internal::String(*other.message_) : - static_cast<internal::String*>(NULL)) { + new ::std::string(*other.message_) : + static_cast< ::std::string*>(NULL)) { } // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE. |