diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2017-05-16 17:00:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 17:00:03 -0400 |
| commit | 7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9 (patch) | |
| tree | 8f92a22eb8633766fc7d2e689593bd100dc17824 /googlemock/src/gmock-internal-utils.cc | |
| parent | 078d5d930ad8b25b3c61556dc6de7ad13fa9a179 (diff) | |
| parent | 09fd5b3ebfaac10b78bda664ec7f57fac74ef214 (diff) | |
| download | googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.tar.gz googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.tar.bz2 googletest-7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9.zip | |
Merge pull request #1089 from nico/stdstring
Use std::string and ::string explicitly in gtest and gmock code.
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index fb530801..6464abc2 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -76,7 +76,7 @@ GTEST_API_ string ConvertIdentifierNameToWords(const char* id_name) { class GoogleTestFailureReporter : public FailureReporterInterface { public: virtual void ReportFailure(FailureType type, const char* file, int line, - const string& message) { + const std::string& message) { AssertHelper(type == kFatal ? TestPartResult::kFatalFailure : TestPartResult::kNonFatalFailure, @@ -128,8 +128,7 @@ GTEST_API_ bool LogIsVisible(LogSeverity severity) { // stack_frames_to_skip is treated as 0, since we don't know which // function calls will be inlined by the compiler and need to be // conservative. -GTEST_API_ void Log(LogSeverity severity, - const string& message, +GTEST_API_ void Log(LogSeverity severity, const std::string& message, int stack_frames_to_skip) { if (!LogIsVisible(severity)) return; |