diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-18 22:42:34 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 22:42:34 (GMT) |
commit | 1489dc8daad3a9eaff89789752c1cadc5f2ece72 (patch) | |
tree | 38e051e8e4fd2a7b82b95d01b1b63cfc3e2f0251 /googletest/src/gtest.cc | |
parent | ea8f6f0e6959c74b1c9ac1f30cbfdc94715d606b (diff) | |
parent | 051053054df6d2dbedd5f572ae288f2f82a289b7 (diff) | |
download | googletest-1489dc8daad3a9eaff89789752c1cadc5f2ece72.zip googletest-1489dc8daad3a9eaff89789752c1cadc5f2ece72.tar.gz googletest-1489dc8daad3a9eaff89789752c1cadc5f2ece72.tar.bz2 |
Merge branch 'master' into support_xboxonerefs/pull/1401/head
Diffstat (limited to 'googletest/src/gtest.cc')
-rw-r--r-- | googletest/src/gtest.cc | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 407241c..723d905 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3835,26 +3835,6 @@ void StreamingListener::SocketWriter::MakeConnection() { // End of class Streaming Listener #endif // GTEST_CAN_STREAM_RESULTS__ -// Class ScopedTrace - -// Pushes the given source file location and message onto a per-thread -// trace stack maintained by Google Test. -void ScopedTrace::PushTrace(const char* file, int line, std::string message) { - TraceInfo trace; - trace.file = file; - trace.line = line; - trace.message.swap(message); - - UnitTest::GetInstance()->PushGTestTrace(trace); -} - -// Pops the info pushed by the c'tor. -ScopedTrace::~ScopedTrace() - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { - UnitTest::GetInstance()->PopGTestTrace(); -} - - // class OsStackTraceGetter const char* const OsStackTraceGetterInterface::kElidedFramesMarker = @@ -5415,4 +5395,23 @@ std::string TempDir() { #endif // GTEST_OS_WINDOWS_MOBILE } +// Class ScopedTrace + +// Pushes the given source file location and message onto a per-thread +// trace stack maintained by Google Test. +void ScopedTrace::PushTrace(const char* file, int line, std::string message) { + internal::TraceInfo trace; + trace.file = file; + trace.line = line; + trace.message.swap(message); + + UnitTest::GetInstance()->PushGTestTrace(trace); +} + +// Pops the info pushed by the c'tor. +ScopedTrace::~ScopedTrace() + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { + UnitTest::GetInstance()->PopGTestTrace(); +} + } // namespace testing |