From 25958f3e4c4097caca8347b7937f5f6fb26d6c56 Mon Sep 17 00:00:00 2001
From: vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Fri, 22 Oct 2010 01:33:11 +0000
Subject: Fixes compiler warning when built with -std=c++0x.

---
 src/gtest.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gtest.cc')

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.
-- 
cgit v1.2.3