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 | 1287840af7b9efca823ad2fecb6d905f2c4a3ace (patch) | |
| tree | 7a9633942ef81e21ec74834e715777e2e062fb43 /src/gtest.cc | |
| parent | 636f903d84ec28714cb3d84a346dfb58f5bc99d3 (diff) | |
| download | gtest-1287840af7b9efca823ad2fecb6d905f2c4a3ace.tar.gz gtest-1287840af7b9efca823ad2fecb6d905f2c4a3ace.tar.bz2 gtest-1287840af7b9efca823ad2fecb6d905f2c4a3ace.tar.xz | |
Fixes compiler warning when built with -std=c++0x.
git-svn-id: http://googletest.googlecode.com/svn/trunk@503 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src/gtest.cc')
| -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 0d41e46..ea3a47c 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. |