Updated to gmock-1.7.0

[alexxy/gromacs.git] / src / external / gmock-1.7.0 / gtest / src / gtest-test-part.cc

diff --git a/src/external/gmock-1.6.0/gtest/src/gtest-test-part.cc b/src/external/gmock-1.7.0/gtest/src/gtest-test-part.cc
similarity index 95%
rename from src/external/gmock-1.6.0/gtest/src/gtest-test-part.cc
rename to src/external/gmock-1.7.0/gtest/src/gtest-test-part.cc
index 5ddc67c1c9e22290bda6b69b88f1efdc898d0e9f..c60eef3ab353114a9b3f7283815762bb58832766 100644 (file)
--- a/src/external/gmock-1.6.0/gtest/src/gtest-test-part.cc
+++ b/src/external/gmock-1.7.0/gtest/src/gtest-test-part.cc
@@ -48,10 +48,10 @@ using internal::GetUnitTestImpl;
 
 // Gets the summary of the failure message by omitting the stack trace
 // in it.
-internal::String TestPartResult::ExtractSummary(const char* message) {
+std::string TestPartResult::ExtractSummary(const char* message) {
   const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
-  return stack_trace == NULL ? internal::String(message) :
-      internal::String(message, stack_trace - message);
+  return stack_trace == NULL ? message :
+      std::string(message, stack_trace);
 }
 
 // Prints a TestPartResult object.