Fixes compiler warning when built with -std=c++0x.

2010-10-22 01:33:11 +00:00
parent 50f4deb1cf
commit 25958f3e4c
4 changed files with 33 additions and 22 deletions
--- 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.