diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-21 13:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 13:11:58 -0400 |
| commit | 96f7ba83cb225dd9152dcffe3104af093e66510a (patch) | |
| tree | 0cf8937f69d91039df408576db9352d4f2c377d8 /googlemock/src/gmock-internal-utils.cc | |
| parent | b74070cfd90c57b3ef2f80c8a50ca5f505a9e3aa (diff) | |
| parent | 675686a139a731a2c796633e67e9421792363709 (diff) | |
| download | googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.gz googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.tar.bz2 googletest-96f7ba83cb225dd9152dcffe3104af093e66510a.zip | |
Merge branch 'master' into wrong-version-reported
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; |