diff options
| author | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 13:45:45 -0400 |
|---|---|---|
| committer | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 13:45:45 -0400 |
| commit | 0c3c811164535eb5e539d83befba9caba48a9dfd (patch) | |
| tree | 0bc15116e1259078b02e6608bc10d838711759b5 /googlemock/src/gmock-internal-utils.cc | |
| parent | 8f04622cc1507a3954490a03a1dfcff9e340359e (diff) | |
| parent | 673c975a963f356b19fea90cb57b69192253da2a (diff) | |
| download | googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.gz googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.bz2 googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.zip | |
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
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; |