diff options
| author | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 12:49:22 -0400 |
|---|---|---|
| committer | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 12:49:22 -0400 |
| commit | 6219d60eb9b71d98c28fe541aeec4a1db284730e (patch) | |
| tree | a9f61d077c3183ab4b458de7624ab2d7a05cd0e3 /googlemock/src/gmock-internal-utils.cc | |
| parent | c113a7151d282cd32d246062783c83ccc65feb28 (diff) | |
| parent | 673c975a963f356b19fea90cb57b69192253da2a (diff) | |
| download | googletest-6219d60eb9b71d98c28fe541aeec4a1db284730e.tar.gz googletest-6219d60eb9b71d98c28fe541aeec4a1db284730e.tar.bz2 googletest-6219d60eb9b71d98c28fe541aeec4a1db284730e.zip | |
Merge remote-tracking branch 'origin/master' into support_xboxone
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; |