diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-11 16:31:23 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-11 16:31:23 (GMT) |
| commit | 6914ae239499b99ab8b3fcbc7c8b584875e29e1b (patch) | |
| tree | 47107a3f74573777e2b994f18143483dfb602378 /googletest/src/gtest.cc | |
| parent | 1d757db65cd12679c2d2213aa3430809b6566ef2 (diff) | |
| download | googletest-6914ae239499b99ab8b3fcbc7c8b584875e29e1b.zip googletest-6914ae239499b99ab8b3fcbc7c8b584875e29e1b.tar.gz googletest-6914ae239499b99ab8b3fcbc7c8b584875e29e1b.tar.bz2 | |
Upstream cl 103120214
Diffstat (limited to 'googletest/src/gtest.cc')
| -rw-r--r-- | googletest/src/gtest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 42f0484..0aeeb8e 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3839,12 +3839,11 @@ void StreamingListener::SocketWriter::MakeConnection() { // Pushes the given source file location and message onto a per-thread // trace stack maintained by Google Test. -ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { +void ScopedTrace::PushTrace(const char* file, int line, std::string message) { TraceInfo trace; trace.file = file; trace.line = line; - trace.message = message.GetString(); + trace.message.swap(message); UnitTest::GetInstance()->PushGTestTrace(trace); } |