diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 10:47:50 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 10:47:50 +0000 |
| commit | c64fb19fe4112e5dcf1826517b8eb9cf4bc098f1 (patch) | |
| tree | 21f5eec73ddb3e5fbabc1656e2b14519b41d7c10 /testing | |
| parent | 0f8548ce550cc889bac2d61f7069be01ee909d0f (diff) | |
| download | chromium_src-c64fb19fe4112e5dcf1826517b8eb9cf4bc098f1.zip chromium_src-c64fb19fe4112e5dcf1826517b8eb9cf4bc098f1.tar.gz chromium_src-c64fb19fe4112e5dcf1826517b8eb9cf4bc098f1.tar.bz2 | |
Fixed gtest_mac.mm after gtest roll to 621.
The issue is caused by the removal of the String(const char*) ctor in http://git.chromium.org/gitweb/?p=external/gtest.git;a=blobdiff;f=include/gtest/internal/gtest-string.h;h=472dd0583917c2ad786dbe4711b53fcadb772d3a;hp=967b11738ef234aa09e3879d98e77c7277e2d3c3;hb=03c314931649a999b0cf5deb0a434a1009157416;hpb=5d9f11fe81eaca3989ec7e8dbfe5b31608a75121.
TBR=rsesek
Review URL: https://codereview.chromium.org/11414027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gtest_mac.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/testing/gtest_mac.mm b/testing/gtest_mac.mm index 94c9a20..c36b18b 100644 --- a/testing/gtest_mac.mm +++ b/testing/gtest_mac.mm @@ -4,6 +4,8 @@ #import "gtest_mac.h" +#include <string> + #include <gtest/internal/gtest-port.h> #include <gtest/internal/gtest-string.h> #include <gtest/gtest.h> @@ -26,8 +28,8 @@ GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, } return EqFailure(expected_expression, actual_expression, - String([[expected description] UTF8String]), - String([[actual description] UTF8String]), + std::string([[expected description] UTF8String]), + std::string([[actual description] UTF8String]), false); } @@ -42,8 +44,8 @@ GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, } Message msg; msg << "Expected: (" << expected_expression << ") != (" << actual_expression - << "), actual: " << String([[expected description] UTF8String]) - << " vs " << String([[actual description] UTF8String]); + << "), actual: " << std::string([[expected description] UTF8String]) + << " vs " << std::string([[actual description] UTF8String]); return AssertionFailure(msg); } |