Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1528)

Unified Diff: testing/gmock/src/gmock-printers.cc

Issue 521012: Update gmock and gtest. (Closed)
Patch Set: update readme Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/gmock/src/gmock-matchers.cc ('k') | testing/gmock/src/gmock-spec-builders.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gmock/src/gmock-printers.cc
diff --git a/testing/gmock/src/gmock-printers.cc b/testing/gmock/src/gmock-printers.cc
index 8efba7824f14d20d0a6e008ef92a542cfd2e9b73..fd7d3055201225734c6e2220f13a5942b0faac56 100644
--- a/testing/gmock/src/gmock-printers.cc
+++ b/testing/gmock/src/gmock-printers.cc
@@ -296,11 +296,9 @@ void PrintStringTo(const ::string& s, ostream* os) {
}
#endif // GTEST_HAS_GLOBAL_STRING
-#if GTEST_HAS_STD_STRING
void PrintStringTo(const ::std::string& s, ostream* os) {
PrintCharsAsStringTo(s.data(), s.size(), os);
}
-#endif // GTEST_HAS_STD_STRING
// Prints a ::wstring object.
#if GTEST_HAS_GLOBAL_WSTRING
« no previous file with comments | « testing/gmock/src/gmock-matchers.cc ('k') | testing/gmock/src/gmock-spec-builders.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698